图片上传

pages/tabbar/my/staffDuan.vue

@@ -430,23 +430,27 @@
 							let narr = rt.result.split(',');
 							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.isQian = true
 									if(res.code==0){
-										this.isQian = true
 										this.contentVal = "核销成功";
-										setTimeout(()=>{
+									} else {
-											this.isQian = false
+										this.contentVal = res.msg;
-										},2000)
+									}
-									} else this.$toolAll.tools.showToast(res.msg);
+									setTimeout(()=>{
+										this.isQian = false
+									},2000)
 								},error=>{})
 							} else {//订单核销
 								this.$requst.post('order/check',{order_coding:narr[0],id:narr[1],check_user:this.userInfo.id}).then(res=>{
+									this.isQian = true
 									if(res.code==0){
-										this.isQian = true
 										this.contentVal = "核销成功";
-										setTimeout(()=>{
+									} else {
-											this.isQian = false
+										this.contentVal = res.msg;
-										},2000)
+									}
-									} else this.$toolAll.tools.showToast(res.msg);
+									setTimeout(()=>{
+										this.isQian = false
+									},2000)
 								},error=>{})
 							}
 						}

pagesA/activityTask/activityTask.vue

@@ -132,7 +132,7 @@
 			return {
 				statusHNH:uni.getStorageSync('statusHNH'),
 				publicColor:uni.getStorageSync('publicColor'),//主题颜色
-				isScreenshot:false,
+				isScreenshot:true,
 				upImg:'',
 				chooseIndex:0,
 				activityList:[],//活动列表
@@ -151,29 +151,18 @@
 		methods: {
 			btnEv(index){
 				this.chooseIndex = index;
-				if(this.activityList[index].ntype=='share_screenshots'){//分享截图测试
+				if(this.activityList[index].ntype=='share_screenshots' && (this.activityList[index].account_status!=0 || this.activityList[index].account_status==2)){//分享截图测试
-					if(this.activityList[index].account_status!=0 || this.activityList[index].account_status==2){
+					this.isScreenshot = true;
-						this.isScreenshot = true;
-					}
 				}
-				if(this.activityList[index].ntype=='offline_sign_in'){//线下签到
+				if(this.activityList[index].ntype=='offline_sign_in' && this.activityList[index].account_status==4){//线下签到
-					if(this.activityList[index].account_status==4) {
+					this.$toolAll.tools.showToast('请先完成任务，再来领取')
-						this.$toolAll.tools.showToast('请先完成任务，再来领取')
-					} else {
-						this.$toolAll.tools.showToast('领取成功');
-						this.checkList();
-					}
 				}
-				if(this.activityList[index].ntype=='share'){//分享注册任务
+				if(this.activityList[index].ntype=='share' && this.activityList[index].account_status==4){//分享注册任务
-					if(this.activityList[index].account_status==4){
+					uni.navigateTo({
-						uni.navigateTo({
+						url:'/pagesB/personalPoster/personalPoster'
-							url:'/pagesB/personalPoster/personalPoster'
+					})
-						})
-					} else {
-						this.$toolAll.tools.showToast('领取成功')
-					}
 				}
-				if(this.activityList[index].isIcon!=3 && this.activityList[index].account_status==1 || this.activityList[index].account_status==3) {
+				if(this.activityList[index].danc == this.activityList[index].allc) {
 					if(this.isNum==0) {
 						this.isNum++;
 						this.$requst.post('task/task/complete-task',{task_id:this.activityList[index].id}).then(res=>{
@@ -256,11 +245,10 @@
 					success: (res) => {
 						console.log(res);
 						this.upImg = res.tempFilePaths[0];
-						this.$requst.post('file/upload/image',{image:this.upImg}).then(res=>{
+						this.$requst.upload('file/upload/image',{file:this.upImg}).then(res=>{
-							if(res.code==0){
+							this.upImg = this.$http + res.data.src
-								
+							this.$toolAll.tools.showToast('图片上传成功(*^▽^*)')
-							}
+						},error=>{})
-						})
 					}
 				})
 			},

pagesA/getReadyDan/getReadyDan.vue

@@ -409,7 +409,7 @@
 					original_total: this.zanAllPrice*100,//原价总金额
 					freight: this.expressInfo.default_price,//快递费
 					remarks: "",//备注
-					is_only:is_only,//是否是单独购买0 不是单独购买，2是单独购买
+					is_only:is_only,//是否是单独购买0 不是单独购买1，2是单独购买
 					is_score:is_score,//是否是积分商品0 不是积分商品，1是积分商品
 					coin:this.zf_kqPrice//孔雀币
 				}

pagesA/myOrder/myOrder.vue

@@ -46,6 +46,7 @@
 				<view class="fon28 col3">
 					<view class="mar-sx20 disje"><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="width100 disje">
+						<view v-if="item.is_only==0 && item.open_one==1" class="order-btn mar-y20">直接免拼</view>
 						<view @tap="transferFrame(index)" v-if="item.orderStatus != 0 && item.orderStatus != 5 && item.virtual_check==0" class="order-cancle">取消订单</view>
 						<view @tap="payMentEv(index)" v-if="item.orderStatus == 1" class="order-btn">付款</view>
 						<!-- <view class="order-btn" v-if="item.is_only==1">单人拼团</view> -->
@@ -247,7 +248,8 @@
 										num:items.num,
 										not_check_num:items.not_check_num,
 										check_type:items.check_type,
-										is_virtual:items.is_virtual
+										is_virtual:items.is_virtual,
+										activity_type:items.activity_type
 									}
 									nchildren.push(objs);
 								})
@@ -261,7 +263,8 @@
 									total: nprice,//合计
 									coin:item.coin,//孔雀币
 									is_only:item.is_only,//是否单独购买
-									virtual_check:item.virtual_check
+									virtual_check:item.virtual_check,
+									// open_one:item.open_one
 								}
 								this.orderList.push(obj);
 							})