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

manifest.json

@@ -4,6 +4,7 @@
     "description" : "商家",
     "versionName" : "1.107",
     "versionCode" : 1107,
+
     "transformPx" : false,
     "compatible" : {
         "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  

pages/addEditEleProduct/addEditEleProduct.vue

@@ -13,7 +13,7 @@
 				<input class="input flex1"  type="text" v-model="" value="" placeholder-class="plclass" placeholder="请填写产品名称"  />
 			</view>
 		</view> -->
-		<view class="noecellbox">
+		<view class="noecellbox" >
 			<view class="title" >关联产品 </view>
 			<view class="inputbox flex">
 				<picker mode="multiSelector" :value="classDataValue"  :range="classData" @change="bindData"  @columnchange="columnbindData">
@@ -22,7 +22,7 @@
 			</view>
 		</view>
 
-		<view class="noecellbox">
+		<view class="noecellbox" :hidden="linkage_product_id == 0 " >
 			<view class="title" >产品规格(kg或个) </view>
 			<view class="inputbox flex">
 				<input class="input flex1"  type="text" value="" v-model="form.specifications" placeholder-class="plclass" placeholder="请填写产品规格"  />
@@ -345,7 +345,7 @@
 				linkage_id:'',
 				is_datashow:true,
 				bools:'',
-				linkage_product_id:'',
+				linkage_product_id:0,
 				classValue:'',
 				ordinary :[],
 				 weigh :[],
@@ -563,7 +563,8 @@
 					console.log(that.ordinary.length,'左边')
 					if(that.ordinary.length != 0){
 						that.linkage_id = that.ordinary[e.detail.value[1]].product_id
-						that.product_id = that.ordinary[e.detail.value[1]].product_id
+						// that.product_id = that.ordinary[e.detail.value[1]].product_id
+						that.linkage_product_id = that.linkage_id
 						that.classValue = that.ordinary[e.detail.value[1]].product_name
 					}else{AZ
 						uni.showToast({
@@ -576,7 +577,8 @@
 					console.log(that.weigh.length,'右边')
 					if(that.weigh.length != 0){
 						that.linkage_id = that.weigh[e.detail.value[1]].product_id
-						that.product_id = that.weigh[e.detail.value[1]].product_id
+						// that.product_id = that.weigh[e.detail.value[1]].product_id
+						that.linkage_product_id = that.linkage_id
 						that.classValue = that.weigh[e.detail.value[1]].product_name
 					}else{
 						uni.showToast({
@@ -586,7 +588,7 @@
 						return false;
 					}	
 				}
-				that.eleProductInfofun();
+				that.eleProductInfofun(that.linkage_id,2);
 				this.is_datashow = false;
 				console.log(this.is_datashow)
 				
@@ -650,7 +652,13 @@
 					this.form.cost_price=res.data.cost_price //进货价钱
 					this.form.code=res.data.code //条形编码
 					this.form.commission=res.data.commission //返佣比例
-					this.form.commodity_data= typeof(res.data.commodity_data) == 'string'?JSON.parse(res.data.commodity_data):res.data.commodity_data //原始商品名
+					
+					if(res.data.commodity_data == "" ){
+						this.form.commodity_data= res.data.commodity_data
+					}else{
+						this.form.commodity_data= typeof(res.data.commodity_data) == 'string'?JSON.parse(res.data.commodity_data):res.data.commodity_data //原始商品名
+					}
+					
 					this.form.product_id=res.data.product_id//修改的时候的产品id
 					this.form.product_name=res.data.product_name//产品名称
 					this.form.desc=res.data.desc//产品描述
@@ -777,10 +785,10 @@
 				
 			},
 			//修改的时候赋初始值
-		 	async eleProductInfofun(){
+		 	async eleProductInfofun(product_id,second=1){
 				let that=this;
 				let res = await eleProductInfo({
-					product_id:this.product_id,
+					product_id:product_id,
 				});
 				if(res.code==0){	
 					this.form.cate_id = res.data.cate_id;//分类id
@@ -791,7 +799,12 @@
 						 }
 					}
 					
-					this.linkage_product_id = res.data.linkage_product_id
+					if(second==1){
+						console.log('第一次')
+						this.linkage_product_id = res.data.linkage_product_id
+					}
+					
+					
 					this.bools = res.data.product_name;
 					this.defaultinfo = res.data;
 					this.form.product_name = res.data.product_name;//名称
@@ -918,6 +931,9 @@
 				// 	return false;
 				// }
 				
+				console.log(this.form.product_id)
+				console.log(this.product_id)
+				
 				let can = {
 					action:this.product_id==''?'add':'edit',
 					linkage_id:this.linkage_id,
@@ -945,10 +961,13 @@
 					limit_num:this.form.limit_num ,//秒杀限购数量	
 					detail_photos:this.detail_photos,//详情图
 					video_photos:this.video_photos,//轮播图
-					cate_id:this.form.cate_id,
-					
+					cate_id:this.form.cate_id,
 				};
 				
+				if(can.action=='edit'){
+					can.product_id=this.product_id
+				}
+				
 				if(this.c_pics.length > 0){
 					can.photo = this.c_pics[0].data; //图片
 				}
@@ -1014,7 +1033,7 @@
 					this.chindformList = res.data;
 					
 					if(this.product_id!=undefined && this.product_id!=""){
-						this.eleProductInfofun();
+						this.eleProductInfofun(this.product_id);
 					}
 				}else{
 					this.$api.msg(res.msg);

pages/index/index.vue

@@ -482,6 +482,7 @@
 								},
 								method: 'GET',
 								success: (results) => {
+									console.log(results)
 									if (results.data.code == 0) {
 										results.isScanCode = false;
 										results.code = res.result;
@@ -494,6 +495,12 @@
 										uni.navigateTo({
 											url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
 										})
+									}else{
+										results.isScanCode = false;
+										results.code = res.result;
+										uni.navigateTo({
+											url: '/pages/addEditEleProduct/addEditEleProduct?results=' + JSON.stringify(results)
+										})
 									}
 								},
 								fail: (results) => {

utils/debug.js

@@ -2,6 +2,7 @@
 //环境变量 这个是 鹿马商家助手的 商家助手的~~~~
 module.exports = {
 	//是否为开发调试环境 true为本地环境 false 为正式环境
+
 	
 	 isdebug:false,//正式
 	//isdebug:true,//测试
@@ -9,5 +10,4 @@ module.exports = {
 	// xqdebug:false,//正式权限	
 	xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios
 
-
 }