chen
/
hengmei-two
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改

master
chen 2021-11-11 10:50:50 +08:00
parent 0847e5b41b
commit 5b006c1eac
26 changed files with 74 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commons/hengmei.css
View File

@ -213,8 +213,8 @@ swiper-item view:last-child .duan-xian{border-bottom: none;}
.item-del-btn{width: 117rpx;height: 205rpx;background: #F85050;line-height: 205rpx;text-align: center;color: #FFFFFF;font-size: 24rpx;flex-shrink: 0;position: absolute;right: 0;bottom: 40rpx;top: 2rpx;} .item-del-btn{width: 117rpx;height: 205rpx;background: #F85050;line-height: 205rpx;text-align: center;color: #FFFFFF;font-size: 24rpx;flex-shrink: 0;position: absolute;right: 0;bottom: 40rpx;top: 2rpx;}
/* 我的订单页面 */ /* 我的订单页面 */
.order-item-box image{width: 166rpx;height: 166rpx;border-radius: 15rpx;margin-right: 12rpx;} .order-item-box image{width: 166rpx;height: 166rpx;border-radius: 15rpx;margin-right: 12rpx;}
.order-btn{width: 140rpx;height: 50rpx;line-height: 50rpx;text-align: center;border-radius: 10rpx;background: #F85050;color: #FFFFFF;margin-left: 45rpx;} .order-btn{width: 210rpx;height: 75rpx;line-height: 75rpx;text-align: center;border-radius: 10rpx;background: #F85050;color: #FFFFFF;margin-left: 45rpx;}
.order-cancle{width: 140rpx;height: 50rpx;line-height: 50rpx;text-align: center;border-radius: 10rpx;background: #E9E9E9;color: #808080;} .order-cancle{width: 210rpx;height: 75rpx;line-height: 75rpx;text-align: center;border-radius: 10rpx;background: #E9E9E9;color: #808080;}
.heyan-close{width: 96rpx;height: 96rpx;left: 50%;transform: translateX(-50%);bottom: -150rpx;} .heyan-close{width: 96rpx;height: 96rpx;left: 50%;transform: translateX(-50%);bottom: -150rpx;}
.confirm-btn{font-size: 36rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin: 80rpx 100rpx 20rpx 100rpx;} .confirm-btn{font-size: 36rpx;color: #FFFFFF;font-weight: bold;margin: 0 auto;background: #3875F6;border-radius: 20rpx;height: 90rpx;line-height: 90rpx;text-align: center;margin: 80rpx 100rpx 20rpx 100rpx;}
/* 地址管理页面 */ /* 地址管理页面 */

25
pages/tabbar/my/staffDuan.vue
View File

@ -16,10 +16,10 @@
<view class="fon36 bold">{{userInfo.nickname || ''}}</view> <view class="fon36 bold">{{userInfo.nickname || ''}}</view>
<view class="gao-name">黄金</view> <view class="gao-name">黄金</view>
</view> </view>
<view class="disac mar-s10" v-if="userInfo.mobile!==''"> <view class="disac mar-s10" v-if="userPhone!==''">
<image src="/static/public/phone-02.png" class="gao-phone" mode=""></image> <image src="/static/public/phone-02.png" class="gao-phone" mode=""></image>
<!-- 手机号 --> <!-- 手机号 -->
<view class="fon24 mar-z10">{{userInfo.mobile}}</view> <view class="fon24 mar-z10">{{userPhone}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -129,7 +129,7 @@
<!-- 弹框授权 --> <!-- 弹框授权 -->
<empower :vision="vision" @cancleEv="cancleEv"></empower> <empower :vision="vision" @cancleEv="cancleEv"></empower>
<view v-if="isQian" class="sigin-box"> <view v-if="isQian" class="sigin-box">
<view>签到成功</view> <view>{{contentVal}}</view>
</view> </view>
</view> </view>
</template> </template>
@ -198,7 +198,9 @@
guangImg:'', guangImg:'',
isAuth:'', isAuth:'',
guanggao:'', guanggao:'',
userToken:'' userToken:'',
contentVal:'',//扫码后的提示内容
userPhone:''
} }
}, },
onUnload: function() { onUnload: function() {
@ -342,7 +344,7 @@
// console.log('用户信息：',res); // console.log('用户信息：',res);
if(res.code==0 && res.data.length!=0) { if(res.code==0 && res.data.length!=0) {
this.userInfo = res.data; this.userInfo = res.data;
this.userInfo.mobile = this.$toolAll.tools.hideMPhone(this.userInfo.mobile); this.userPhone = this.$toolAll.tools.hideMPhone(this.userInfo.mobile)
this.tongList[0].num = res.data.score;//个人积分 this.tongList[0].num = res.data.score;//个人积分
this.tongList[1].num = res.data.coin;//个人孔雀币 this.tongList[1].num = res.data.coin;//个人孔雀币
this.tongList[2].num = res.data.continuity_sign;//个人连续签到 this.tongList[2].num = res.data.continuity_sign;//个人连续签到
@ -408,6 +410,7 @@
// console.log('执行扫码事件：',res); // console.log('执行扫码事件：',res);
if(res.code==0){ if(res.code==0){
this.isQian = true this.isQian = true
this.contentVal = "签到成功";
setTimeout(()=>{ setTimeout(()=>{
this.isQian = false this.isQian = false
},2000) },2000)
@ -428,13 +431,21 @@
if(narr[1]=='true'){//体验券核销 if(narr[1]=='true'){//体验券核销
this.$requst.post('staff/coupon/write-off-experience-coupon',{coupon_id:narr[0],secret:narr[2],account_id:this.userInfo.id}).then(res=>{ this.$requst.post('staff/coupon/write-off-experience-coupon',{coupon_id:narr[0],secret:narr[2],account_id:this.userInfo.id}).then(res=>{
if(res.code==0){ if(res.code==0){
this.$toolAll.tools.showToast('核销成功'); this.isQian = true
this.contentVal = "核销成功";
setTimeout(()=>{
this.isQian = false
},2000)
} else this.$toolAll.tools.showToast(res.msg); } else this.$toolAll.tools.showToast(res.msg);
},error=>{}) },error=>{})
} else {//订单核销 } else {//订单核销
this.$requst.post('order/check',{order_coding:narr[0],id:narr[1],check_user:this.userInfo.id}).then(res=>{ this.$requst.post('order/check',{order_coding:narr[0],id:narr[1],check_user:this.userInfo.id}).then(res=>{
if(res.code==0){ if(res.code==0){
this.$toolAll.tools.showToast('核销成功'); this.isQian = true
this.contentVal = "核销成功";
setTimeout(()=>{
this.isQian = false
},2000)
} else this.$toolAll.tools.showToast(res.msg); } else this.$toolAll.tools.showToast(res.msg);
},error=>{}) },error=>{})
} }

8
pagesA/activityTask/activityTask.vue
View File

@ -27,6 +27,7 @@
</view> </view>
<!-- 分享截图任务 --> <!-- 分享截图任务 -->
<view v-if="item.ntype=='share_screenshots'" class="disja"> <view v-if="item.ntype=='share_screenshots'" class="disja">
<!-- <view @tap="btnEv(index)" class="activity-dai mar-s30">立即完成</view> -->
<view v-if="item.account_status==3 || item.account_status==4" @tap="btnEv(index)" class="activity-dai mar-s30">立即完成</view> <view v-if="item.account_status==3 || item.account_status==4" @tap="btnEv(index)" class="activity-dai mar-s30">立即完成</view>
<view v-if="item.account_status==0" class="activity-mo mar-s30">审核中...</view> <view v-if="item.account_status==0" class="activity-mo mar-s30">审核中...</view>
<view v-if="item.account_status==2" @tap="btnEv(index)" class="activity-dai mar-s30">审核不通过，重新提交审核</view> <view v-if="item.account_status==2" @tap="btnEv(index)" class="activity-dai mar-s30">审核不通过，重新提交审核</view>
@ -254,7 +255,12 @@
sourceType:['album'], sourceType:['album'],
success: (res) => { success: (res) => {
console.log(res); console.log(res);
this.upImg = res.tempFilePaths[0] this.upImg = res.tempFilePaths[0];
this.$requst.post('file/upload/image',{image:this.upImg}).then(res=>{
if(res.code==0){
}
})
} }
}) })
}, },

13
pagesA/coupon/coupon.vue
View File

@ -88,6 +88,9 @@
}).exec() }).exec()
this.checkAllList(0); this.checkAllList(0);
}, },
onUnload() {
this.closeQuanEv();
},
methods: { methods: {
checkAllList(index){//查询所有优惠券列表 checkAllList(index){//查询所有优惠券列表
let params = { let params = {
@ -159,10 +162,12 @@
this.timer = setInterval(()=>{ this.timer = setInterval(()=>{
this.$requst.post('staff/coupon/write-off-experience-couponQuery',{coupon_id:this.dataList[index].id,secret:this.secret}).then(res=>{ this.$requst.post('staff/coupon/write-off-experience-couponQuery',{coupon_id:this.dataList[index].id,secret:this.secret}).then(res=>{
if(res.code==0){ if(res.code==0){
this.$toolAll.tools.showToast('使用成功'); if(res.data.result==0){
this.isTY = false; this.$toolAll.tools.showToast('使用成功');
clearInterval(this.timer); this.isTY = false;
this.checkAllList(0); clearInterval(this.timer);
this.checkAllList(0);
}
} }
}) })
},3000) },3000)

2
pagesA/getReadyDan/getReadyDan.vue
View File

@ -455,7 +455,7 @@
// url:`/pagesA/immediatePayment/immediatePayment?allPrice=${this.allPrice}&allNum=${this.allNum}&startTime=${new Date(res.header.Date).getTime()}` // url:`/pagesA/immediatePayment/immediatePayment?allPrice=${this.allPrice}&allNum=${this.allNum}&startTime=${new Date(res.header.Date).getTime()}`
// }) // })
} else { } else {
this.$toolAll.tools.showToast(res.data.msg); this.$toolAll.tools.showToast(res.data.msg,'none',3000);
this.times = 0; this.times = 0;
} }
} }

13
pagesA/myOrder/myOrder.vue
View File

@ -18,7 +18,7 @@
<view v-if="item.virtual_check==0" class="bold" :class="(item.orderStatus==1 || item.orderStatus==2 || item.orderStatus==3) ? 'colf8':'col9'">{{['','待付款','待发货','待核验','待收货','交易完成'][item.orderStatus]}}</view> <view v-if="item.virtual_check==0" class="bold" :class="(item.orderStatus==1 || item.orderStatus==2 || item.orderStatus==3) ? 'colf8':'col9'">{{['','待付款','待发货','待核验','待收货','交易完成'][item.orderStatus]}}</view>
<view v-if="item.virtual_check==1" class="bold col9">已核验</view> <view v-if="item.virtual_check==1" class="bold col9">已核验</view>
</view> </view>
<view v-for="(itemc,indexc) in item.childrenList" :key="indexc" class="fon26 col3 disjbac pad-sx50 disjbac bbot"> <view v-for="(itemc,indexc) in item.childrenList" :key="indexc" class="fon26 col3 disjbac pad-sx50 disjbac bbot posir" :style="{paddingBottom:itemc.is_virtual!=0?'70rpx':'50rpx'}">
<image @tap="goDetail(item.id)" :src="itemc.imgSrc" class="flexs" mode="aspectFill"></image> <image @tap="goDetail(item.id)" :src="itemc.imgSrc" class="flexs" mode="aspectFill"></image>
<view @tap="goDetail(item.id)" class="width100 disjb fc" style="height: 166rpx;"> <view @tap="goDetail(item.id)" class="width100 disjb fc" style="height: 166rpx;">
<view> <view>
@ -27,10 +27,11 @@
</view> </view>
<view class="disjbac mar-s10"> <view class="disjbac mar-s10">
<view class="colf8 fon32 bold"><span v-if="item.isShop==0">￥</span><span v-else>积分：</span>{{itemc.price}}<span class="fon28 col6 mar-z20 font4">x{{itemc.num}}</span></view> <view class="colf8 fon32 bold"><span v-if="item.isShop==0">￥</span><span v-else>积分：</span>{{itemc.price}}<span class="fon28 col6 mar-z20 font4">x{{itemc.num}}</span></view>
<view @tap.stop="make(index,indexc)" v-if="item.orderStatus == 3 && item.virtual_check==0 && itemc.check_type=='frontend'" class="order-btn">线下核销</view> <view @tap.stop="make(index,indexc)" v-if="itemc.is_virtual!=0 && itemc.check_type=='frontend' && itemc.not_check_num!=0" class="order-btn">线下核销</view>
<view v-if="item.orderStatus == 3 && item.virtual_check==0 && itemc.check_type!='frontend'" class="order-btn" style="background-color: #CCCCCC;">线上核销</view> <view v-if="itemc.is_virtual!=0 && itemc.check_type!='frontend'" class="order-btn" style="background-color: #CCCCCC;">线上核销</view>
</view> </view>
</view> </view>
<view v-if="itemc.is_virtual!=0" class="disjbac mar-s10 posia colf8" style="bottom: 20rpx;">已核验 x{{itemc.not_check_num}}</view>
</view> </view>
<!-- <view class="fon28 col3 pad-s20 disjbac"> <!-- <view class="fon28 col3 pad-s20 disjbac">
<view class="flexs"><span v-if="item.isShop==0">合计：<span v-if="item.is_only!=1">{{item.total}}</span><span v-if="item.is_only==1">{{item.total}}</span> +<span v-if="item.coin!=0">{{item.coin}}孔雀币</span></span><span v-else>合计积分：{{item.total}}</span></view> <view class="flexs"><span v-if="item.isShop==0">合计：<span v-if="item.is_only!=1">{{item.total}}</span><span v-if="item.is_only==1">{{item.total}}</span> +<span v-if="item.coin!=0">{{item.coin}}孔雀币</span></span><span v-else>合计积分：{{item.total}}</span></view>
@ -245,7 +246,8 @@
price:childrenPrice, price:childrenPrice,
num:items.num, num:items.num,
not_check_num:items.not_check_num, not_check_num:items.not_check_num,
check_type:items.check_type check_type:items.check_type,
is_virtual:items.is_virtual
} }
nchildren.push(objs); nchildren.push(objs);
}) })
@ -338,7 +340,8 @@
confirmReceipt(id){//确认收货事件 confirmReceipt(id){//确认收货事件
this.$requst.post('order/accepted',{order_id:id}).then(res=>{ this.$requst.post('order/accepted',{order_id:id}).then(res=>{
if(res.code==0){ if(res.code==0){
this.$toolAll.tools.showToast('收货成功');
this.checkList(this.activeIndex);
} else this.$toolAll.tools.showToast(res.msg); } else this.$toolAll.tools.showToast(res.msg);
}) })
}, },

1
pagesA/nodifyData/nodifyData.vue
View File

@ -134,6 +134,7 @@
let firstObj = uni.getStorageSync('firstInfo') let firstObj = uni.getStorageSync('firstInfo')
if(firstObj==''){ if(firstObj==''){
let obj = uni.getStorageSync('uinfo') let obj = uni.getStorageSync('uinfo')
console.log(obj);
if(obj!='') this.uinfo = obj if(obj!='') this.uinfo = obj
this.dataList[0].imgSrc = obj.headimgurl//用户头像 this.dataList[0].imgSrc = obj.headimgurl//用户头像
this.dataList[1].content = obj.nickname//用户昵称 this.dataList[1].content = obj.nickname//用户昵称

12
pagesB/orderDetail/orderDetail.vue
View File

@ -10,7 +10,7 @@
<view class="bold">{{['商城订单','积分商城订单'][orderInfo.is_score]}}</view> <view class="bold">{{['商城订单','积分商城订单'][orderInfo.is_score]}}</view>
<view v-if="orderInfo.status=='waiting'" class="colf8 bold">待付款</view> <view v-if="orderInfo.status=='waiting'" class="colf8 bold">待付款</view>
<view v-if="orderInfo.status=='paid' && orderInfo.has_virtual!=1" class="colf8 bold">待发货</view> <view v-if="orderInfo.status=='paid' && orderInfo.has_virtual!=1" class="colf8 bold">待发货</view>
<view v-if="orderInfo.status=='shipped'" class="colf8 bold">待收货</view> <view v-if="orderInfo.status=='shipped' && orderInfo.has_virtual!=1" class="colf8 bold">待收货</view>
<view v-if="orderInfo.status=='completed'" class="col9 bold">已完成</view> <view v-if="orderInfo.status=='completed'" class="col9 bold">已完成</view>
<view v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1" class="colf8 bold">待核验</view> <view v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1" class="colf8 bold">待核验</view>
<view v-if="orderInfo.virtual_check==1 && orderInfo.has_virtual==1" class="col9 bold">已核验</view> <view v-if="orderInfo.virtual_check==1 && orderInfo.has_virtual==1" class="col9 bold">已核验</view>
@ -88,7 +88,7 @@
<view @tap="cancleEv">取消订单</view> <view @tap="cancleEv">取消订单</view>
</view> </view>
<!-- 确认收货 --> <!-- 确认收货 -->
<view class="orderInfo-btn" v-if="orderInfo.status=='shipped'">确认收货</view> <view @tap="confirmReceipt(orderInfo.id)" class="orderInfo-btn" v-if="orderInfo.status=='shipped'">确认收货</view>
</view> </view>
<!-- 待核验弹框 --> <!-- 待核验弹框 -->
<view v-if="isHeyan" @tap="isHeyan=false" class="disjcac tc posAll" style="z-index: 3;"> <view v-if="isHeyan" @tap="isHeyan=false" class="disjcac tc posAll" style="z-index: 3;">
@ -150,6 +150,14 @@
this.checkInfo(options.id); this.checkInfo(options.id);
}, },
methods: { methods: {
confirmReceipt(id){//确认收货事件
this.$requst.post('order/accepted',{order_id:id}).then(res=>{
if(res.code==0){
this.$toolAll.tools.showToast('收货成功');
this.checkInfo(this.orderInfo.id);
} else this.$toolAll.tools.showToast(res.msg);
})
},
make(index){ make(index){
this.isHeyan = true; this.isHeyan = true;
this.text = `${this.orderInfo.coding},${this.orderInfo.skus[index].id}`; this.text = `${this.orderInfo.coding},${this.orderInfo.skus[index].id}`;

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/backTop.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/cate-items/cate-pu.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/empower.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/foot-tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/nothing-page.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/public-customer.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/simple-address/simple-address.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/status-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper-pu.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/wfalls-flow.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/pageHome/pageHome.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabbar/shop/shop.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/nodifyData/nodifyData.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/messagecenter/messagecenter.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/myCollection/myCollection.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/video/playVideo.js.map vendored
View File

File diff suppressed because one or more lines are too long