wbb

manifest.json

@@ -3,8 +3,8 @@
     //"appid" : "__UNI__FC9419E",
     "appid" : "__UNI__1EA80F1", //这个是 web 的
     "description" : "商家",
-    "versionName" : "1.0.96",
-    "versionCode" : 196,
+    "versionName" : "1.0.99",
+    "versionCode" : 199,
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true, //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  

pages/addEditEleProduct/addEditEleProduct.vue

@@ -390,10 +390,6 @@
 					checked:'2'
 				}],
 				ischeckedtime:[0],//默认选中，
-				myProps: {
-				      label: 'cate_name',
-				      value: 'cate_id',
-				},
 				name: 'product',
 				result:[],
 				form: {
@@ -452,13 +448,16 @@
 				activity_type:"",//判断是否可以秒杀
 				seckilltimelist:[],//秒杀时段列表
 				selchildList:[],
-				cate_name:"",
+				
 				index:0,
 				isScanCode:true,//是不是点击了扫码 
 				codeDisabled:false,//条形码是否能输入
 				update:true,
 				detail_photos:[],//详情图片
-				video_photos:[],//轮播图片
+				video_photos:[],//轮播图片
+				
+				cate_name:"", //分类名
+				
 			}
 		},
 		computed: {
@@ -766,6 +765,14 @@
 					product_id:this.product_id,
 				});
 				if(res.code==0){	
+					this.form.cate_id = res.data.cate_id;//分类id
+					for(var i = 0; i < this.chindformList.length; i++) {
+						 if(this.chindformList[i].cate_id==res.data.cate_id){
+						 	this.cate_name=this.chindformList[i].cate_name;
+							break;
+						 }
+					}
+					
 					this.linkage_product_id = res.data.linkage_product_id
 					this.bools = res.data.product_name;
 					this.defaultinfo = res.data;
@@ -776,7 +783,7 @@
 					this.form.photo = res.data.photo;//图片
 					this.form.activity_price = res.data.activity_price //秒杀价
 					this.form.store_count = res.data.store_count //秒杀库存
-					this.form.cate_id = res.data.cate_id;//分类id
+					
 					this.form.activity_id = res.data.activity_id//秒杀时段id
 					this.form.limit_num = res.data.limit_num
 					this.form.specifications = res.data.gram

pages/index/index.vue

@@ -97,7 +97,7 @@
 				<!-- <navigator url="/pages/edit/pro_manage/pro_manage"> -->
 				<view class="jiu_min">
 					<view>
-						<image class="img" src="/static/icon/20.png" mode=""></image>
+						<image class="img" src="/static/icon/spgl.png" mode=""></image>
 					</view>
 					<view>商品管理</view>
 				</view>
@@ -144,7 +144,7 @@
 				<navigator url="/pages/storeCategory/storeCategory?type=1">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/6.png" mode=""></image>
+							<image class="img" src="/static/icon/eleclass.png" mode=""></image>
 						</view>
 						<view>商品分类</view>
 					</view>
@@ -186,12 +186,12 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max">
+			<view class="jiu_max"  v-if="shop_type == 'goods'">
 				<!-- 商城订单 -->
 				<navigator url="/pages/order/shopOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -204,7 +204,7 @@
 				<navigator url="/pages/hotelOrder/hotelOrder">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/8.png" mode=""></image>
+							<image class="img" src="/static/icon/eleguanli.png" mode=""></image>
 						</view>
 						<view>订单管理</view>
 					</view>
@@ -227,7 +227,7 @@
 				<navigator url="/pages/LuckDraw/homenav/homenav">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/news/liwuiocn.png" mode=""></image>
+							<image class="img" src="/static/icon/liwuiocn.png" mode=""></image>
 						</view>
 						<view>抽奖活动</view>
 					</view>
@@ -245,7 +245,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/Printer/AddPrinter">
 					<view class="jiu_min">
 						<view>
@@ -256,7 +256,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max " @tap="shops">
+			<view class="jiu_max " @tap="shops" v-if="shop_type == 'ele'">
 				<view class="jiu_min">
 					<view>
 						<image class="img" src="/static/news/turntable.png" mode=""></image>
@@ -265,7 +265,7 @@
 				</view>
 			</view>
 
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/deliveryCost/deliveryCost">
 					<view class="jiu_min">
 						<view>
@@ -277,7 +277,7 @@
 			</view>
 			<!-- hgService.showSafeSetting(); -->
 
-			<view class="jiu_max " v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=1">
 					<view class="jiu_min">
 						<view>
@@ -288,7 +288,7 @@
 				</navigator>
 			</view>
 
-			<view class="jiu_max " v-if="is_bld">
+			<view class="jiu_max " v-if="shop_type == 'ele'&&is_bld">
 				<navigator url="/pages/eleProduct/eleProduct?edit=2">
 					<view class="jiu_min">
 						<view>
@@ -300,9 +300,9 @@
 			</view>
 
 
-			<view class="jiu_max " @click="download" v-if="is_bld">
+			<view class="jiu_max " @click="download" v-if="shop_type == 'ele'&&is_bld">
 				<view>
-					<view class="jiu_min">
+					<view class="jiu_min"> 
 						<view>
 							<image class="img" src="/static/icon/download.png" mode=""></image>
 						</view>
@@ -313,11 +313,11 @@
 
 
 			<!-- url="/pages/publishActivities/activityList/activityList" -->
-			<view class="jiu_max ">
+			<view class="jiu_max " v-if="shop_type == 'ele'">
 				<navigator url="/pages/publishActivities/activityList/activityList">
 					<view class="jiu_min">
 						<view>
-							<image class="img" src="/static/icon/download.png" mode=""></image>
+							<image class="img" src="/static/icon/0yuan.png" mode=""></image>
 						</view>
 						<view>0元领活动</view>
 					</view>
@@ -564,7 +564,7 @@
 					this.is_luck_draw = res.data.shop_info.is_luck_draw
 					this.money_type = res.data.shop_info.money_type
 					this.activity_type = res.data.shop_info.activity_type //判断是否有秒杀资格
-
+					console.log(this.shop_type,'aa')
 				} else {
 					this.$api.msg(res.msg);
 				}

pages/publishActivities/activityDetail/activityDetail.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="">
 			<view class="" style="text-align: center;height: 120upx;line-height: 120upx;font-weight: bold;font-size: 32upx;">
-				以有 <text style="color: #21B94C;font-size: 60upx;">150</text>人领取   还剩50人未领取
+				已有 <text style="color: #21B94C;font-size: 60upx;">{{receivePeopleNumber}}</text>人领取   还剩{{unreceivePeopleNumber}}人未核销
 			</view>
 		</view>
 		<view class="" style="height: 160upx;padding: 0 24upx;background-color: rgb(255, 255, 255);margin-bottom: 20upx;" v-if="getDetail.length > 0 " v-for="(item,index) in getDetail">
@@ -51,11 +51,12 @@
 				shop_id:'',
 				activity_id:'',
 				getDetail:[],
-				page:1
+				page:1,
+				receivePeopleNumber:0,
+				unreceivePeopleNumber:0,
 			}
 		},
 		onReachBottom() {
-			console.log('触底加载');
 			activity_user({
 				shop_id:this.shop_id,
 				activity_id:this.activity_id,
@@ -64,7 +65,9 @@
 			}).then(res=>{
 				if(res.code==0&&res.data.list.length>0){
 					this.page++
-					this.getDetail = res.data.list
+					this.getDetail = res.data.list;
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
 					uni.stopPullDownRefresh();
 				}else{
 					uni.$api.msg('没有更多数据了')
@@ -81,6 +84,8 @@
 			}).then(res=>{
 				if(res.code==0){
 					this.getDetail = res.data.list
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
 					uni.stopPullDownRefresh();
 				}
 			})
@@ -102,7 +107,9 @@
 				nucleus:1
 			}).then(res=>{
 				if(res.code==0){
-					this.getDetail = res.data.list
+					this.getDetail = res.data.list;
+					this.receivePeopleNumber=res.data.receivePeopleNumber;
+					this.unreceivePeopleNumber=res.data.unreceivePeopleNumber;
 				}
 			})
 			

pages/publishActivities/activityList/activityList.vue

@@ -23,7 +23,7 @@
 						</label> -->
 						<image class="thumbnail" :src="staticUrl + item.picture" mode=""></image>
 						<view class="infobox" style="width: 70%;">
-							<view class="title oneline" style="height:40upx ;">{{item.goods_name}}</view>
+							<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>

utils/debug.js

@@ -4,8 +4,8 @@ module.exports = {
 	//是否为开发调试环境 true为本地环境 false 为正式环境
 
 	
-	//isdebug:false,//正式
-	 isdebug:true,//测试
+	// isdebug:false,//正式
+	isdebug:true,//测试
 	
 	// xqdebug:false,//正式权限	
 	 xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios