太阳码

ghsApp/src/admin/home/mall.vue

@@ -59,7 +59,7 @@ export default {
     },
     goToMallPt (url) {
       let self = this
-        console.log(url + '?account=' + self.loginInfo.shopId)
+        console.log('pagesPurchase/ghsProduct?shopId='+ this.loginInfo.shopId+'&id=0&ghsShopAdminId='+this.loginInfo.shopAdminId)
         uni.navigateToMiniProgram({
 					//姜枫-2021.04.13
 					appId: this.getappIdList.hd.miniAppId,

hdApp/src/admin/billing/affirmGhs.vue

@@ -236,14 +236,14 @@
             <appTimer :placeholder="'默认30分钟后配送'" @confirm="onConfirm" :sendTime="sendTime"></appTimer>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 						<view class="tui-title ">运费</view>
-						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder" disabled>
+						<input type="number" placeholder="" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder" disabled>
 					</tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="toCoupon">
 						<view class="tui-title ">红包/抵用券</view>
 						<view class="coupon_box">{{couponText}}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<textarea style="height: 100rpx" v-model="remark" placeholder="备注..."/>
+						<textarea style="height: 100rpx" v-model="remark" placeholder="备注"/>
 					</tui-list-cell>
 				</view>
 			</form>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -213,9 +213,36 @@ export default {
 	},
 	methods: {
 		init(){
-			const { shopId,id} = this.options;
-			//花材列表
+
+			//扫码采购 shish 20210614
+			if(this.option.scene){
+				console.log('scene',this.option.scene)
+				const scene = decodeURIComponent(this.option.scene);
+				var sceneItem = scene.split("&");
+				var arr, name, value;
+				var sceneArray = new Array();
+				for (var i = 0, l = sceneItem.length; i < l; i++) {
+					arr = sceneItem[i].split("=");
+					name = arr[0];
+					value = arr[1];
+					sceneArray[name] = value;
+				}
+				if(sceneArray.sId){
+					this.option.shopId = sceneArray.sId
+					this.shopId = sceneArray.sId
+				}
+				if(sceneArray.gId){
+					this.option.ghsShopAdminId = sceneArray.gId
+				}
+				if(sceneArray.id){
+					this.option.id = sceneArray.id
+				}
+			}
+
+			//只要拿到供货商的门店ID即可先取花材，不需要生成供货商id
+			const { shopId,id} = this.option;
 			this.initGhsData(id,shopId);
+
 			if(this.option.id == 0) {
 				return ghsInfo({shopId: this.option.shopId}).then(res => {
 					this.pageInfo = res.data
@@ -258,18 +285,18 @@ export default {
 				this.initAllInput();
 			})
 		},
-    toPage() {
-      this.$util.pageTo({
-        url: "/pagesClient/official/index",
-        type: 2,
-        query: {
-          ghsShopAdminId: this.ghsShopAdminId,
-          hdShopAdminId: this.hdShopAdminId
-        },
-      });
-    },
-    // 拨打电话  wangn  2021-5-6
-    toPhone(phone){
+		toPage() {
+			this.$util.pageTo({
+				url: "/pagesClient/official/index",
+				type: 2,
+				query: {
+					ghsShopAdminId: this.ghsShopAdminId,
+					hdShopAdminId: this.hdShopAdminId
+				},
+			});
+		},
+		// 拨打电话  wangn  2021-5-6
+		toPhone(phone){
 			uni.makePhoneCall({
 				phoneNumber: phone
 			});