zxf

manifest.json

@@ -3,8 +3,8 @@
     //"appid" : "__UNI__FC9419E",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "商家",
-    "versionName" : "1.0.99",
-    "versionCode" : 199,
+    "versionName" : "1.1.00",
+    "versionCode" : 110,
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
@@ -126,9 +126,9 @@
             },
             "splashscreen" : {
                 "android" : {
-                    "hdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
-                    "xhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png",
-                    "xxhdpi" : "C:/Users/Administrator/Desktop/证书/d0abce82961b508e6a0b9924d15fe86.png"
+                    "hdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
+                    "xhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png",
+                    "xxhdpi" : "C:/Users/Administrator/Desktop/da/6b51802bba0a32ac69392831b1fc324.png"
                 },
                 "ios" : {
                     "iphone" : {

pages/addEditEleProduct/addEditEleProduct.vue

@@ -341,6 +341,7 @@
 		},
 		data() {
 			return {
+				
 				linkage_id:'',
 				is_datashow:true,
 				bools:'',
@@ -429,7 +430,13 @@
 					{}
 				],
 				isShow:false,
-				chindformList:[],
+				chindformList:[],
+				myProps:{
+					label:'cate_name',
+					value: 'cate_id',
+					children: '',
+				},
+				
 				//上传图片相关的
 				c_pics: [],
 				c_pics1:[],
@@ -731,7 +738,6 @@
 				 
 			},
 			confirm(e){
-				console.log(this.chindformList);return;
 				this.cate_name = e.item.cate_name;
 				this.form.cate_id =e.item.cate_id;
 				this.index = e.index;
@@ -768,7 +774,8 @@
 				
 			},
 			//修改的时候赋初始值
-		 	async eleProductInfofun(){
+		 	async eleProductInfofun(){
+				let that=this;
 				let res = await eleProductInfo({
 					product_id:this.product_id,
 				});
@@ -808,24 +815,32 @@
 					this.form.commission  = res.data.commission, 				//返佣比例
 					this.form.sell_type = res.data.sell_type,				// 售卖类型
 					this.form.mandatory = res.data.mandatory
-					this.video_photos=res.data.video_photos;//轮播
-					this.detail_photos=res.data.detail_photos;//详情
-					res.data.video_photos.map(item=>{ //轮播
-						this.c_pics1.push({
-							code:0,
-							data:item,
-							msg:"success",
-							time:"1587101904"
-						})
-					})
-					res.data.detail_photos.map(item=>{ //详情
-						this.c_pics2.push({
-							code:0,
-							data:item,
-							msg:"success",
-							time:"1587101904"
-						})
-					})
+					
+					if(typeof res.data.video_photos == 'object'){
+						this.video_photos=res.data.video_photos;//轮播
+						for(let i in res.data.video_photos){
+							this.c_pics1.push({
+								code:0,
+								data:res.data.video_photos[i],
+								msg:"success",
+								time:"1587101904"
+							});
+						}
+					}
+					
+					
+					if(typeof res.data.detail_photos == 'object'){
+						this.detail_photos=res.data.detail_photos;//详情
+						for(let i in res.data.detail_photos){
+							this.c_pics2.push({
+								code:0,
+								data:res.data.detail_photos[i],
+								msg:"success",
+								time:"1587101904"
+							});
+						}
+					}
+					
 					//下拉分类 初始值
 					this.chindformList.forEach((item,index)=>{
 						if(item.cate_id==res.data.cate_id){
@@ -834,6 +849,8 @@
 						}
 					});
 					
+					
+					
 					if(res.data.commodity_type == 'ordinary') {
 						this.ordinary.map(item=>{
 							if(this.linkage_product_id == item.product_id){

pages/eleProduct/eleProduct.vue

@@ -230,9 +230,11 @@
 			this.goods_list  = [];
 			this.page = 1;
 			this.isallshow=false;
+			this.tabactive = 1,
 			// this.goods_product_list();
 			this.searchProduct();
-		},
+		},
+		
 		computed: {
 			staticUrl () {//静态资源地址
 				return this.$store.state.staticUrl;

pages/index/index.vue

@@ -368,15 +368,6 @@
 			}
 		},
 		onLoad() {
-			getskipShop({
-				type: 'bld'
-			}).then(res => {
-				if (res.code == 0) {
-					this.is_bld = res.data.is_bld
-					// this.is_bld = 1
-
-				}
-			})
 			//显示欢迎回来~
 			setTimeout(() => {
 				this.$refs.Welcome.show();
@@ -410,6 +401,16 @@
 			// uni.stopPullDownRefresh();//结束下拉刷新
 		},
 		onShow() {
+			
+			getskipShop({
+				type: 'bld'
+			}).then(res => {
+				if (res.code == 0) {
+					this.is_bld = res.data.is_bld
+					// this.is_bld = 1
+			
+				}
+			})
 			this.storeIndexfun();
 
 
@@ -439,7 +440,15 @@
 
 							activity_nucleus(param).then(res => {
 								if (res.code == 0) {
-									this.$api.msg(res.msg);
+									uni.showModal({
+										title:'提示',
+										content:res.msg,
+										showCancel:false,
+										confirmText:'确定',
+										success() {
+											
+										}
+									})
 								}else{
 									this.$api.msg(res.msg);
 								}

pages/order/order.vue

@@ -333,6 +333,6 @@
 	}
 
 	.orderlist{
-		padding: 100upx 24upx 0 24upx;box-sizing: border-box;
+		padding: 40upx 24upx 0 24upx;box-sizing: border-box;
 	}
 </style>

pages/publishActivities/activityList/activityList.vue

@@ -15,7 +15,7 @@
 
 		<view class="projuctlist" :hidden="!(tabactive==1)">
 			<view class="" v-if="start_activity.length>0">
-				<checkbox-group >
+				<checkbox-group>
 					<!-- 单个商品 -->
 					<view class="itempro flex " v-for="(item,index) in start_activity" :key="index" @click="jumpDetail(item.activity_id)">
 						<!-- <label class="ali-c">
@@ -23,40 +23,43 @@
 						</label> -->
 						<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
 						<view class="infobox" style="width: 70%;">
+
 							<view class="title oneline" style="height:45upx ;">{{item.goods_name}}</view>
+
 							<!-- <view class="time">上架时间：{{item.create_time}}</view> -->
 							<view>
 								<view style="font-size:26rpx;font-weight:bold;">领取时间：</view>
 								<view style="font-size:24rpx;color:#656565">{{item.start}}—{{item.end}}</view>
 							</view>
 						</view>
-						<view class="btnbox flex" >
+						<view class="btnbox flex">
 							<!-- <view class="btns btnboxdel" @tap="deleteEleProductfun(item,index)">删 除</view> -->
 							<!-- <view class="btns btnboxxj" @tap="Selectiondata(item)" v-if="tabactive==1 && isselect==1">加入活动</view> -->
 							<!-- <view class="btns btnboxxj" @tap="sold_outfun(item.id,1,index)" v-else-if="tabactive==1">下 架</view> -->
 							<!-- <view class="btns btnboxxj"  @tap="sold_outfun(item.id,0,index)"  v-show="tabactive==2">上 架</view> -->
 							<!-- <view class="btns btnboxxj" @click="setSpecs(item.product_id)" >规格</view> -->
-							<view >
-								<view class="btnboxdel flex" style="align-items: center;" @click.stop="switch1Change">  
-											活动开关：<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" />
-											<view class="btns btnboxdel" @tap.stop="tochanges(item,index)">修 改</view>
+							<view>
+								<view class="btnboxdel flex" style="align-items: center;" @click.stop="switch1Change">
+									活动开关：
+									<switch :data-activity_id="item.activity_id" :checked="item.state==1" @change="switch1Change" />
+									<view class="btns btnboxdel" @tap.stop="tochanges(item,index)">修 改</view>
 								</view>
 							</view>
-							
+
 						</view>
 					</view>
 				</checkbox-group>
 			</view>
-			
+
 			<view v-if="start_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
-				还没有人领取~~
+				<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
 			</view>
-			
+
 		</view>
 
 		<view class="projuctlist" :hidden="!(tabactive==2)">
 			<view class="" v-if="end_activity.length > 0">
-				<checkbox-group  >
+				<checkbox-group>
 					<!-- 单个商品 -->
 					<view class="itempro flex " v-for="(item,index) in end_activity" :key="index" @click="jumpDetail(item.activity_id)">
 						<!-- <label class="ali-c">
@@ -86,7 +89,7 @@
 				</checkbox-group>
 			</view>
 			<view v-if="end_activity.length <= 0" style="text-align: center;width: 100%;height:1000upx;line-height: 1000upx;font-size: 50upx;color:#8C8C8C ;">
-				还没有人领取~~
+				<image src="https://luma.jxdsy.cn//static/applet5/images/uts/meiyoule.png" mode=""></image>
 			</view>
 		</view>
 
@@ -109,8 +112,8 @@
 				page: 0,
 				start_activity: [],
 				end_activity: [],
-				endpages:0,
-				startpages:0
+				endpages: 0,
+				startpages: 0
 
 			}
 		},
@@ -130,8 +133,8 @@
 			})
 		},
 		//下拉刷新
-		onPullDownRefresh(){
-			if(this.tabactive == 1){
+		onPullDownRefresh() {
+			if (this.tabactive == 1) {
 				this.startpages = 0
 				activity_select({
 					shop_id: this.shop_id,
@@ -143,8 +146,8 @@
 						uni.stopPullDownRefresh();
 					}
 				})
-				
-			}else if(this.tabactive == 2){
+
+			} else if (this.tabactive == 2) {
 				this.endpages = 0
 				activity_select({
 					shop_id: this.shop_id,
@@ -156,34 +159,34 @@
 						uni.stopPullDownRefresh();
 					}
 				})
-				
+
 			}
-					
+
 		},
 		//上拉触底
-		onReachBottom(){
+		onReachBottom() {
 			if (this.tabactive == 1) {
-					activity_select({
-						shop_id: this.shop_id,
-						page: ++this.startpages,
-						is_date: 2
-					}).then(res => {
-						if (res.code == 0) {
-							this.start_activity = [...this.start_activity,...res.data.data]
-						}
-					})
-				
+				activity_select({
+					shop_id: this.shop_id,
+					page: ++this.startpages,
+					is_date: 2
+				}).then(res => {
+					if (res.code == 0) {
+						this.start_activity = [...this.start_activity, ...res.data.data]
+					}
+				})
+
 			} else if (this.tabactive == 2) {
-					activity_select({
-						shop_id: this.shop_id,
-						page: ++this.endpages,
-						is_date: 1
-					}).then(res => {
-						if (res.code == 0) {
-							this.end_activity = [...this.this.end_activity,...res.data.data]
-						}
-					})
-				} 
+				activity_select({
+					shop_id: this.shop_id,
+					page: ++this.endpages,
+					is_date: 1
+				}).then(res => {
+					if (res.code == 0) {
+						this.end_activity = [...this.end_activity, ...res.data.data]
+					}
+				})
+			}
 		},
 
 		onShow() {
@@ -214,10 +217,10 @@
 		},
 
 		methods: {
-			
-			jumpDetail(activity_id){
+
+			jumpDetail(activity_id) {
 				uni.navigateTo({
-					url:`/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}`
+					url: `/pages/publishActivities/activityDetail/activityDetail?activity_id=${activity_id}`
 				})
 			},
 			//修改活动
@@ -227,14 +230,14 @@
 					url: `/pages/publishActivities/publishActivity/publishActivity?id=${data.activity_id}&type=edit`,
 				})
 			},
-				
+
 			// 查找产品
-			findEleProduct(){
-				
+			findEleProduct() {
+
 			},
 
 			switch1Change(e) {
-				if(e.type=='change'){
+				if (e.type == 'change') {
 					console.log(e)
 					if (e.detail.value) {
 						activity_close({
@@ -258,10 +261,10 @@
 							}
 						})
 					}
-				}else{
-					return ;
+				} else {
+					return;
 				}
-				
+
 			},
 			//交互end
 			taggletab(index) {

pages/storeqrcode/storeqrcode.vue

@@ -163,6 +163,7 @@
 						
 						const d = await getSharePoster({
 							// backgroundImage:"/static/news/sjrwm.png",
+							
 							
 							backgroundImage:this.statictowUrl+"static/applet5/images/uts/sjrwm.png",
 							
@@ -239,16 +240,23 @@
 								// Context.setFillStyle('black');
 								// Context.setGlobalAlpha(0.3);
 								// Context.fillRect(0, bgObj.height - bgObj.height*0.2, bgObj.width, bgObj.height*0.2);
-							}
+							},
+							
 						});
-						console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
-						this.poster.finalPath = d.poster.tempFilePath;
+						
+						
+						console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
+						
+						
+						this.poster.finalPath = d.poster.tempFilePath;
+						console.log(this.poster.finalPath)
 					}
 					this.qrShow = true;
 				} catch (e) {
 					_app.hideLoading();
 					_app.showToast(JSON.stringify(e));
-					console.log(JSON.stringify(e));
+					console.log(JSON.stringify(e));
+					console.log('海报生成成功， 临时路径: ' + d.poster.tempFilePath)
 				}
 			},
 			saveImage() {
@@ -278,7 +286,9 @@
 			}
 		}
 	}
-</script>
+</script>
+
+
 
 <style lang="scss">
 	.hideCanvasView {

utils/api/merchant.js

@@ -38,12 +38,12 @@ export function getActivityList(data){
 
 //判断商家类型  商品入库 
 export function getskipShop(data){
-	return request.post("/user/skipShop", data, { noAuth: true});
+	return request.post("user/skipShop", data, { noAuth: true});
 }
 
 //获取分类 列表
 export function getshopclass(data){
-	return request.post("/ele/weigh", data, { noAuth: true});
+	return request.post("ele/weigh", data, { noAuth: true});
 }
 
 
@@ -52,7 +52,7 @@ export function getshopclass(data){
  */
 //获取分类 列表
 export function activity_nucleus(data){
-	return request.post("/ele/activity_nucleus", data, { noAuth: true});
+	return request.post("ele/activity_nucleus", data, { noAuth: true});
 }
 
 /**
@@ -60,7 +60,7 @@ export function activity_nucleus(data){
  * @param {Object} data
  */
 export function activity_add(data){
-	return request.post("/ele/activity_add", data, { noAuth: true});
+	return request.post("ele/activity_add", data, { noAuth: true});
 }
 
 /**
@@ -68,7 +68,7 @@ export function activity_add(data){
  * @param {Object} data
  */
 export function activity_select(data){
-	return request.post("/ele/activity_select", data, { noAuth: true});
+	return request.post("ele/activity_select", data, { noAuth: true});
 }
 
 /**
@@ -76,7 +76,7 @@ export function activity_select(data){
  * @param {Object} data
  */
 export function activity_close(data){
-	return request.post("/ele/activity_close", data, { noAuth: true});
+	return request.post("ele/activity_close", data, { noAuth: true});
 }
 
 /**
@@ -84,7 +84,7 @@ export function activity_close(data){
  * @param {} data
  */
 export function activity_find(data){
-	return request.post("/ele/activity_find", data, { noAuth: true});
+	return request.post("ele/activity_find", data, { noAuth: true});
 }
 
 
@@ -93,7 +93,7 @@ export function activity_find(data){
  * @param {} data
  */
 export function activity_user(data){
-	return request.post("/ele/activity_user", data, { noAuth: true});
+	return request.post("ele/activity_user", data, { noAuth: true});
 }
 
 
@@ -102,5 +102,5 @@ export function activity_user(data){
  * @param {} data
  */
 export function activity_update(data){
-	return request.post("/ele/activity_update", data, { noAuth: true});
+	return request.post("ele/activity_update", data, { noAuth: true});
 }
\ No newline at end of file

utils/debug.js

@@ -8,14 +8,10 @@ module.exports = {
 	// isdebug:true,//测试
 	
 	// xqdebug:false,//正式权限	
-	 xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
-	
-	
-	/**
-	 * PS
-	 * 
-	 * 正式环境 选 false !
-	 * 本地开发环境 选 true
-	 * 
-	 * */
+	xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
+
+	// #ifdef APP-PLUS
+	// isdebug:false,//正式 APP里面绝对是正式
+	// #endif	
+
 }