shish 5 éve
szülő
commit
3f94dd8778

+ 3 - 1
ghsApp/src/pagesInvite/list.vue

@@ -146,7 +146,9 @@ export default {
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.hd.miniAppId,
-					path: 'pagesClient/official/index',
+					path: 'admin/official/index',
+					//develop 开发板 trial 体验版 release 正式版
+					envVersion: 'develop',
 					extraData: {
 						'shopAdminId': this.loginInfo.shopAdminId
 					},

+ 1 - 1
hdApp/src/admin/interest/my-invite.vue

@@ -139,7 +139,7 @@ export default {
           title: "更懂您的花卉宝",
           desc: "",
           imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-          pagePath: "admin/official/index?introMerchantId=" + res.id
+          pagePath: "admin/official/index?shopAdminId=0"
         };
         this.jweixinFn(params);
       });

+ 7 - 8
hdApp/src/admin/official/apply.vue

@@ -61,12 +61,11 @@
       </div>
       <!-- 推荐人 -->
       <div class="module-com recommend-wrap" v-if="!$util.isEmpty(merchantData)">
-        <div class="recommend-tag">荐人</div>
+        <div class="recommend-tag">荐人</div>
         <div class="recommend-det">
           <image style="width:90rpx;height:90rpx;border-radius:42rpx;" mode="scaleToFill" :src="merchantData.smallLogoUrl" @error="imageError" />
           <div class="recommend-info">
             <div class="app-size-32">{{ merchantData.merchantName }}</div>
-            <div class="app-color-2">{{ merchantData.fullAddress }}</div>
           </div>
         </div>
       </div>
@@ -148,7 +147,7 @@ export default {
    
       this.$util.getCheckLogin().then(res => {
         if (res) {
-          let id = uni.getStorageSync("introMerchantId");
+          let id = uni.getStorageSync("shopAdminId");
           if (id > 0) {
             this._getMerchantDet();
           }
@@ -162,16 +161,16 @@ export default {
       });
     },
     _getMerchantDet() {
-      let id = uni.getStorageSync("introMerchantId");
-      getIntroduce({ id: id }).then(res => {
-        this.merchantData = res.data;
+      let id = uni.getStorageSync("shopAdminId");
+      getIntroduce({ shopAdminId: id }).then(res => {
+        this.merchantData = res.data.introduce;
       });
     },
     // ==============
     confirmFn() {
-      let id = uni.getStorageSync("introMerchantId");
+      let id = uni.getStorageSync("shopAdminId");
       applyRegister({
-        introMerchantId: id || 0,
+        shopAdminId: id || 0,
         ...this.form
       }).then(res => {
         uni.setStorageSync("officialApply", res.data);

+ 4 - 4
hdApp/src/admin/official/index.vue

@@ -152,11 +152,11 @@ export default {
         uni.removeStorageSync("renewOption");
       }
       //花店分享的页面有邀人,打开页面保存邀请人
-      let introMerchantId = 0;
-      if (typeof this.option.introMerchantId != "undefined") {
-        introMerchantId = this.option.introMerchantId;
+      let shopAdminId = 0;
+      if (typeof this.option.shopAdminId != "undefined") {
+        shopAdminId = this.option.shopAdminId;
       }
-      uni.setStorageSync("introMerchantId", introMerchantId);
+      uni.setStorageSync("shopAdminId", shopAdminId);
     },
     _getDet() {
       applyStatus().then(res => {

+ 1 - 1
hdApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "imgHost": "https://img.huaml.com",
     "merchantName":"花美玲"
   }