Skip to content

L
lumastoreapp
Commit ba32a0f4 authored by 石家欣's avatar 石家欣
Browse files
Options

Merge branch 'dev' of http://rungit.jxdsy.cn:10000/xys/lumastoreapp into dev

parents 566fcb2f 92602cc4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2563 additions and 131 deletions
App.vue
View file @ ba32a0f4
......@@ -69,8 +69,8 @@
if(this.$store.state.token!=""){//判断是否 已登录
let res = await newsRemind({})
console.log(res,'我登陆了')
if(res.code==0){
if(res.data.length!=0){
//进来了就是有消息
......@@ -99,15 +99,12 @@
})
}
}else{
}else if(msglist.length!=0){
//多条的时候
console.info("提示多条订单~");
let msgtext = `你有${msglist.length}条新的鹿马订单了,请及时处理`;
if(this.$store.state.isvoice){
this.$store.dispatch('AudioVoice',msgtext).then((e) => {
console.log(e);
console.info("循环消息列表2");
console.info(e,"循环消息列表2");
//震动 调用//400ms//长震动
uni.vibrateLong({
success:(re)=> {
......@@ -127,38 +124,6 @@
}
}
// for(let i=0;i<msglist.length;i++){
// let item = msglist[i];
// // item.message
// // isvoice 开关
// if(this.$store.state.isvoice){
// this.$store.dispatch('AudioVoice',item.message).then((e) => {
// console.log(e);
// console.info("循环消息列表2");
// //震动 调用//400ms//长震动
// uni.vibrateLong({
// success:(re)=> {
// },
// fail:(a)=> {
// }
// })
// })
// }else{
// //震动 调用//400ms//长震动
// uni.vibrateLong({
// success:(re)=> {
// },
// fail:(a)=> {
// }
// })
// }
// }
console.info("循环消息列表3");
//回调
......
components/orderItemss/orderItemss.vue
View file @ ba32a0f4
......@@ -133,6 +133,7 @@
let res = await immediatelyOrder({
order_id:this.dataorder.order_id,
});
console.log(res,'aaaaaaa')
if(res.code==0){
this.$api.msg(res.msg);
this.$emit("reload",{});//重新加载
......
manifest.json
View file @ ba32a0f4
......@@ -3,8 +3,8 @@
//"appid" : "__UNI__FC9419E",
"appid" : "__UNI__1EA80F1", //这个是 web 的
"description" : "",
"versionName" : "1.0.76",
"versionCode" : 176,
"versionName" : "1.0.77",
"versionCode" : 177,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
......
pages/edit/shop/shop.vue
View file @ ba32a0f4
......@@ -15,29 +15,43 @@
</view>
<view class="cu-form-group ">
<view class="title">店铺电话：</view>
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺电话" disabled="disabled" v-model="fromdata.tel"></input>
<view class="flex1 jus-b ali-c">
<input class="title" style="flex-grow: 1;" placeholder="请修改店铺电话" type="number" v-if="editortel" @blur='telblur' focus="true" v-model="editortelvalue"></input>
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺电话" v-else disabled="disabled" v-model="fromdata.tel"></input>
<view style="color: #FF6900;border:1px solid #FF6900;font-size:20upx;padding: 0 5upx;" @tap="editorTel">编辑</view>
</view>
</view>
<view class="cu-form-group " @tap="chooseLocation">
<view class="cu-form-group " >
<view class="title">店铺地址：</view>
<view class="flex1 jus-b ali-c">
<input class="title" style="flex-grow: 1;" placeholder="请输入店铺地址" disabled="disabled" v-model="fromdata.addr"></input>
<view class="" style="color: #FF6900;border:1px solid #FF6900;font-size:20upx;padding: 0 5upx;">修改地址</view>
<view style="color: #FF6900;border:1px solid #FF6900;font-size:20upx;padding: 0 5upx;" @tap="chooseLocation">编辑</view>
</view>
</view>
<view class="cu-form-group flex" style="padding: 30upx;">
<view class="title">营业时间：</view>
<view class="time flex">
<view class="biao_05_2">
<view class="flex1 jus-b ali-c">
<view class="time flex">
<view class="biao_05_2">
<view class="uni-list-cell-db flex">
<view style="color:rgb(84, 84, 84);font-size: 32upx;">{{time}}</view>
</view>
</view>
<view class="biao_05_2 flex" style="margin: 0 20upx 0 20upx;">--</view>
<view class="uni-list-cell-db flex">
<view class="" style="color:rgb(84, 84, 84);font-size: 32upx;">{{time}}</view>
<view class="" style="color:rgb(84, 84, 84);font-size: 32upx;">{{time_close}}</view>
</view>
</view>
<view class="biao_05_2 flex" style="margin: 0 20upx 0 20upx;">--</view>
<view class="uni-list-cell-db flex">
<view class="" style="color:rgb(84, 84, 84);font-size: 32upx;">{{time_close}}</view>
</view>
<view class="" style="color: #FF6900;border:1px solid #FF6900;font-size:20upx;padding: 0 5upx;" @tap='modifyTime'>编辑</view>
<lb-picker ref="picker" :list="list2" :value='value' range-key="label" mode="multiSelector" :level='2' @confirm='confirm'></lb-picker>
</view>
</view>
<view class="cu-form-group ">
<view class="title">介绍：</view>
......@@ -63,6 +77,7 @@
<button @tap="addNewStoreFun()" class="cu-btn bg-red margin-tb-sm lg">提交</button>
</view>
</view> -->
</view>
</template>
......@@ -78,10 +93,14 @@
key: 'KROBZ-N2ORJ-VYBFJ-F76TY-ASPMT-JFBFH'
});
var telStr = /^[1](([3][0-9])|([4][5-9])|([5][0-3,5-9])|([6][5,6])|([7][0-8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/;
import timeList from './timeList.json';
export default {
data() {
return {
list2: [],//选择得时间
editortel:false,
editortelvalue:'',
content: [],
list: [],
address: '',
......@@ -104,12 +123,7 @@
},
//addr: "南昌市"
//contact: ""
//business_time: "9:00-18:00"
//logo: ""
//lat: 28.68503
//lng: 115.89925
//可能少的
......@@ -131,6 +145,8 @@
this.content = this.$api.json.content;
//获取之前设置过的信息
this.getshopDetail();
this.list2=timeList.list;
console.log(timeList)
},
components: {
uniIcon,
......@@ -239,12 +255,35 @@
this.list.shop_state = false // 0
}
},
editorTel(){ //点击修改电话
this.editortel=true;
},
modifyTime(){//点击编辑营业时间
console.log('点击了');
this.$refs.picker.show() // 显示
},
confirm(e){
console.log(e.item[0].label,e.item[1].label)
this.fromdata.business_time = e.item[0].label+'-'+e.item[1].label; //营业时间 需要特殊处理
this.addNewStoreFun(); //修改信息
this.time = e.item[0].label;
this.time_close = e.item[1].label;
},
telblur(){ //失去焦点
if (this.editortelvalue == '' || !(telStr.test(this.editortelvalue))) {
this.$api.msg('请输入正确手机号');
}else{
this.editortel=false;
this.fromdata.tel = this.editortelvalue;
this.editortelvalue='';
this.addNewStoreFun(); //修改信息
}
},
//选中定位 获取经纬度
chooseLocation() {
uni.chooseLocation({
success: (data) => {
//console.log(data)
qqmapsdk.reverseGeocoder({
location: {
latitude: data.latitude,
......@@ -255,15 +294,7 @@
this.fromdata.lng = res.result.location.lng;
this.fromdata.addr = res.result.address+res.result.formatted_addresses.rough;
addNewStore(this.fromdata).then(res=>{ //修改商家信息
if (res.code == 0) {
this.$api.msg(res.msg);
} else {
this.$api.msg(res.msg);
}
});
console.log(this.fromdata.addr,"res");
this.addNewStoreFun(); //修改信息
},
fail: (err)=>{
console.log(err)
......@@ -272,6 +303,15 @@
}
});
},
async addNewStoreFun(){
addNewStore(this.fromdata).then(res=>{ //修改商家信息
if (res.code == 0) {
this.$api.msg(res.msg);
} else {
this.$api.msg(res.msg);
}
});
},
onEditorReady(data) {
uni.createSelectorQuery().select('#editor').context((res) => {
console.log(res)
......
pages/edit/shop/timeList.json 0 → 100644
View file @ ba32a0f4
This diff is collapsed.
pages/index/index.vue
View file @ ba32a0f4
......@@ -2,7 +2,6 @@
<!-- 商家助手首页 -->
<view class="index">
<view class="head">
<!-- @tap="demoaudio" -->
<view class="tit">店铺名称:{{storeinfo.shop_name}} </view>
<!-- {{shop.shop_name}} -->
<view class="jiu">
......@@ -330,52 +329,10 @@
}, 1000)
},
methods: {
demoaudio() {
//语音提醒
//AudioVoice openVoice
// setInterval(()=>{
// this.$store.dispatch('AudioVoice',"您有新的资金变化,请注意查看").then((e) => {
// console.log(e);
// })
// },10000);
this.$store.dispatch('AudioVoice', "您有新的订单,请注意查看").then((e) => {
console.log(e);
//震动 调用
//400ms
//长震动
uni.vibrateLong({
success: (re) => {
},
fail: (a) => {
}
})
// 短震动
//15ms
// uni.vibrateShort()({
// success:(re)=> {
// },
// fail:(a)=> {
// }
// })
})
},
//弹窗
tan() {
this.tancl = !this.tancl
},
//获取首页的数据
async storeIndexfun() {
let res = await storeIndex({
......
pages/specsShop/specsShop.vue
View file @ ba32a0f4
......@@ -9,14 +9,21 @@
</picker> -->
<picker @change="bindPickerChange" :value="Typeindex" :range="goodsSpec_goodsType" range-key="name">
<!-- <view class="uni-input">{{array[index]}}</view> -->
<!-- <picker @change="bindPickerChange" :value="Typeindex" :range="goodsSpec_goodsType" range-key="name">
<view class="specsmodel flex ali-c">
<text class="title">规格模型:</text>
<view class="modlename">{{goodsSpec_goodsType[Typeindex].name?goodsSpec_goodsType[Typeindex].name:""}}</view>
<image class="dopicon" src="/static/news/dopicon.png" mode=""></image>
</view>
</picker>
</picker> -->
<view class="specsmodel flex ali-c" @tap='bindPickerChange'>
<text class="title">规格模型:</text>
<view class="modlename">{{goodsSpec_goodsType[Typeindex].name?goodsSpec_goodsType[Typeindex].name:""}}</view>
<image class="dopicon" src="/static/news/dopicon.png" mode=""></image>
</view>
<lb-picker ref="picker" :list="goodsSpec_goodsType" :value='Typeindex' range-key="label" :props="myProps" @confirm='confirm'></lb-picker>
<!-- 多选框列表 -->
......@@ -87,6 +94,12 @@
},
data() {
return {
myProps: {
label: 'name',
value: 'cate_id',
},
name:"shops",
form:{
pics: [{name: '测试'}],
......@@ -137,6 +150,23 @@
this.goodsSpecfun();//商品规格详情
},
methods:{
confirm(e){
console.log(e)
// this.parent_name=e.item.value;
// this.canform.cate_id=;
// this.cate_name = e.item.cate_name;
this.type_id =e.item.id;
this.Typeindex = e.index;
this.ajaxGetSpecSelectfun();//获取选中的分类下面的规格
},
//分类选择触发后
bindPickerChange(e){
this.$refs.picker.show() // 显示
},
//上传图片的方法
uploadimgfun(index){
//上传图片方法
......@@ -232,14 +262,7 @@
this.$api.msg(res.msg);
}
},
//分类选择触发后
bindPickerChange(e){
//console.info(e.detail.value);
this.Typeindex = e.detail.value;
this.type_id = this.goodsSpec_goodsType[e.detail.value].id;//分类id
this.ajaxGetSpecSelectfun();//获取选中的分类下面的规格
},
//获取类型规格详情 通过上面的那个接口 里面的 goodsSpec_goodsType里面的id去获取
async ajaxGetSpecSelectfun(){
let res = await ajaxGetSpecSelect({
......
store/index.js
View file @ ba32a0f4
......@@ -168,17 +168,13 @@ const store = new Vuex.Store({
})
},
AudioVoice(context,text){//获取音频对象播放
console.info("测试进来了~");
return new Promise(resolve=>{
Voice({
voiceSet: {
tex:text,
// tex: '您有新的外卖订单请即时处理'
// tex:"余额到账1000元",
},
returnAudio: true
}).then(audio=>{
console.log('获取音频对象')
audio.onPlay(()=>{
console.log('音频开始播放了')
})
......
utils/debug.js
View file @ ba32a0f4
......@@ -2,8 +2,9 @@
//环境变量 这个是 鹿马商家助手的 商家助手的~~~~
module.exports = {
//是否为开发调试环境 true为本地环境 false 为正式环境
isdebug:true,//测试
// isdebug:false,//正式
//isdebug:true,//测试
isdebug:false,//正式
xqdebug:false,//正式权限
......@@ -11,9 +12,7 @@ module.exports = {
// #ifdef APP-PLUS
// isdebug:false,//正式 APP里面绝对是正式
// #endif
// #endif
/**
* PS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment