小菊优化

ghsApp/src/admin/billing/index.vue

@@ -142,7 +142,7 @@ export default {
 
 			this.customData = this.xjDataInfo
 
-			if(this.xjData.price == null){
+			if(this.xjData.cancel == 1){
 				this.customData.bigCount = 0
 				this.customData.smallCount = 0
 				console.log('this.customData',this.customData)

ghsApp/src/admin/item/xj.vue

@@ -90,16 +90,15 @@ export default {
 			let pages = getCurrentPages();
 			let prevPage = pages[ pages.length - 2 ];
 			//修改上一页data里面的xjData
-			prevPage.$vm.xjData = {price:null,stock:0,hasUpdate:1}
+			prevPage.$vm.xjData = {price:null,stock:0,hasUpdate:1,cancel:1}
 			uni.navigateBack({});
-
 		},
 		goBack(){
 			//返回上一页带参数
 			let pages = getCurrentPages();
 			let prevPage = pages[ pages.length - 2 ];
 			//修改上一页data里面的xjData
-			prevPage.$vm.xjData = {price:this.option.price,stock:0,hasUpdate:0}
+			prevPage.$vm.xjData = {price:this.option.price,stock:0,hasUpdate:0,cancel:0}
 			uni.navigateBack({});
 		},
 		confirmXj(){
@@ -126,7 +125,7 @@ export default {
 			}
 
 			if(totalNum > Number(this.option.stock)){
-				this.$msg("数量不能超过总库存")
+				this.$msg("数量超过总库存")
 				return false
 			}
 
@@ -136,9 +135,8 @@ export default {
 			let pages = getCurrentPages();
 			let prevPage = pages[ pages.length - 2 ];
 			//修改上一页data里面的xjData
-			prevPage.$vm.xjData = {price:this.option.price,stock:totalNum,hasUpdate:1}
+			prevPage.$vm.xjData = {price:this.option.price,stock:totalNum,hasUpdate:1,cancel:0}
 			uni.navigateBack({});
-
 		},
 		init(){
 			getSjXj().then(res => {

ghsApp/src/admin/item/xjSelect.vue

@@ -5,7 +5,7 @@
 				<view class="item_list_bx"  style="width: 100%">
 					<view v-for="(xjItem,xjIndex) in xjList" :key="xjIndex">
 						<view>
-							<view class="item-cmd_bx">
+							<view class="item-cmd_bx" @click="previewImage(xjItem.bigCover)">
 								<view class="img_bx" style="background:#eeeeee">
 									<image :src="xjItem.cover"></image>
 								</view>
@@ -13,10 +13,10 @@
 									<view class="tit">{{ xjItem.name || "" }}</view>
 									<view class="kc"></view>
 									<view class="num-open_bx">
-										<view class="open-bx warn">
+										<view class="open-bx warn" @tap.stop.prevent>
 											<text v-if="xjItem.has == 0" style="color:#777777;">已停用</text>
 											<text v-else style="color:green;">已启用</text>
-<switch :checked="xjItem.has == 0 ? false : true" @change="changeFn($event,xjItem.id)" style="transform: scale(0.7,0.7)" />
+<switch :checked="xjItem.has == 0 ? false : true" @change="changeFn($event,xjItem.id)" style="transform: scale(0.8,0.8)" />
 										</view>
 									</view>
 								</view>
@@ -69,6 +69,12 @@ export default {
 	onShow(){
 	},
 	methods: {
+		previewImage(url){
+			console.log('url',url)
+			uni.previewImage({
+				urls: [url]
+			})
+		},
 		changeFn(e,id){
 			let act = e.target.value == true ? 'add' : 'del'
 			let that = this
@@ -266,8 +272,8 @@ export default {
 				}
 				switch{
 					position: absolute;
-					right:50rpx;
-					top:105rpx;
+					right:30rpx;
+					top:60rpx;
 				}
 			}
 		}

ghsApp/src/components/module/app-commodity.vue

@@ -166,7 +166,8 @@ export default {
 				this.animationFun('add');
 				this.$emit("add", this.info);
 			}else{
-				this.customNum(variety)
+				//去特殊品种页
+				this.$emit("goToSpecialVariety", this.info);
 			}
 		},
 		delEvent(variety) {
@@ -174,7 +175,8 @@ export default {
 				this.animationFun('del');
 				this.$emit("del", this.info);				
 			}else{
-				this.customNum(variety)
+				//去特殊品种页
+				this.$emit("goToSpecialVariety", this.info);
 			}
 		},
 		changePriceEvent(event) {

ghsApp/src/pages.json

@@ -544,7 +544,7 @@
 				{
 					"path": "xjSelect",
 					"style": {
-						"navigationBarTitleText": "小菊颜色"
+						"navigationBarTitleText": "小菊颜色选择"
 					}
 				}
 			]