app 优化

ghsApp/src/admin/home/workbench.vue

@@ -54,10 +54,8 @@
 
 			<!-- 散客和花店开单 -->
 			<view class="tabs-head_bx">
-				<image v-if="isScanEnv==false" @click="skKd()" :src="skSrc" mode="widthFix"></image>
-				<image v-else @click="skKd()" :src="skSrc3" mode="widthFix"></image>
-				<image v-if="isScanEnv==false" @click="customKd()" :src="pfSrc" mode="widthFix" ></image>
-				<image v-else @click="customKd()" :src="pfSrc3" mode="widthFix" ></image>
+				<image @click="skKd()" :src="isScanEnv ? skSrc3 : skSrc" mode="widthFix"></image>
+				<image @click="customKd()" :src="isScanEnv ? pfSrc3 : pfSrc" mode="widthFix" ></image>				
 			</view>
 			
 			<!-- 使用手册 -->
@@ -186,7 +184,6 @@ export default {
 		uni.stopPullDownRefresh();
 	},
 	onShow() {
-
 		// #ifdef APP-PLUS
 		//PDA扫码开单前准备好所有花材
 		allProduct().then(res=>{
@@ -194,7 +191,6 @@ export default {
 			console.log('................载入最新花材和库存................')
 		})
 		// #endif
-
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),

ghsApp/src/mixins/globalMixins.js

@@ -111,7 +111,9 @@ export default {
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           uni.showTabBar()
           this.skCustomId = subRes.data.skCustomId
+          // #ifdef APP-PLUS
           this.listenPDAkd()
+          // #endif
           this.setUserShopAll()
           if (this.init) {
             this.init()

ghsApp/src/mixins/product.js

@@ -154,15 +154,14 @@ export default {
 
 		},
 		//直接清除记忆花材不提示
-		removeMemoryDirect(customId=0){
+		removeMemoryDirect(targetId=0){
 			let that = this
-			if(customId!=0){
-				uni.removeStorageSync('selectList_'+that.pageType+'_target_'+customId)
+			if(targetId!=0){
+				uni.removeStorageSync('selectList_'+that.pageType+'_target_'+targetId)
 			}else{
 				uni.removeStorageSync('selectList_'+that.pageType)
 			}
 			that.resetSelectInfoByType(that.pageType)
-
 			if(!this.$util.isEmpty(this.globalClassItemList)){
 				this.globalClassItemList.forEach((item,index,arr) =>{
 					if(!this.$util.isEmpty(arr[index].child)){
@@ -175,7 +174,6 @@ export default {
 				})
 				this.$forceUpdate()
 			}
-
 		},
 		//请求商品数据
 		async initData(extendInfo) {

ghsApp/src/pagesPurchase/add.vue

@@ -122,9 +122,6 @@ export default {
 		},
 	},
 	onShow(){
-		if(uni.getStorageSync('selectList_'+this.pageType)){
-			this.setSelectInfoByType({ type: this.pageType, info: uni.getStorageSync('selectList_'+this.pageType) });
-		}
 		this.cgItemInit()
 	},
 	onUnload() {

ghsApp/src/pagesPurchase/details.vue

@@ -307,33 +307,33 @@ export default {
 			this.form.city = e.cityName;
 		},
 		async confirmFn() {
-			try {
-				const { orderSn } = this.option;
-				let formData = this.form;
-				if (orderSn) {
-					formData.orderSn = orderSn;
-				}
-				const itemInfo = this.selectList.map(ele => {
-					return {
-						classId: ele.classId,
-						productId: ele.id,
-						bigNum: ele.bigCount,
-						smallNum: ele.smallCount,
-						itemId:ele.itemId,
-						itemPrice: ele.userPrice
-					};
-				});
-				formData.itemInfo = JSON.stringify(itemInfo);
-				if (!this.getMerchantInfo) {
-					await this.initMerchantInfo();
+
+			const { orderSn } = this.option;
+			let formData = this.form;
+			if (orderSn) {
+				formData.orderSn = orderSn;
+			}
+			const itemInfo = this.selectList.map(ele => {
+				return {
+					classId: ele.classId,
+					productId: ele.id,
+					bigNum: ele.bigCount,
+					smallNum: ele.smallCount,
+					itemId:ele.itemId,
+					itemPrice: ele.userPrice
 				}
-				const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.getLoginInfo.cgModel});
-				uni.setStorageSync('flowersItemInfo', itemInfo);
-				
-				this.removeMemoryDirect(this.form.ghsId)
+			})
+			formData.itemInfo = JSON.stringify(itemInfo)
+			if (!this.getMerchantInfo) {
+				await this.initMerchantInfo()
+			}
+			const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.getLoginInfo.cgModel})
+			uni.setStorageSync('flowersItemInfo', itemInfo)
+
+			this.removeMemoryDirect(this.form.ghsId)
+
+			uni.reLaunch({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
 
-				uni.reLaunch({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
-			} catch (error) {}
 		},
 		formSubmitFun(){
 			let that = this;

ghsApp/src/utils/util.js

@@ -409,12 +409,14 @@ export const confirmModal = (item,okCallback=null,cancelCallback=null) => {
 //判断是否有扫码的条件
 export const isScanEnv = () =>{
 	let isScanEnv = false
+	//#ifdef APP-PLUS
 	if(plus.device.vendor == 'SUNMI'){
 		isScanEnv = true
 	}
 	if(plus.device.vendor == 'Newland'){
 		isScanEnv = true
 	}
+	//#endif
 	return isScanEnv
 }
 export default {