邀请开店

ghsApp/src/pagesClient/official/apply.vue

@@ -142,7 +142,7 @@
           <image
             style="width:90rpx;height:90rpx;border-radius:42rpx;"
             mode="scaleToFill"
-            :src="merchantData.smallLogoUrl"
+            :src="merchantData.logoUrl"
             @error="imageError"
           />
           <div class="recommend-info">
@@ -183,14 +183,10 @@ import AppAvatarModule from "@/components/module/app-avatar";
 import AppUploader from "@/components/app-uploader";
 import AppBindInfo from "@/components/app-bind-info";
 const form = require("@/utils/formValidation.js");
-// api
 import {
   getIntroduce,
-  applyRegister,
-  // sendSmsW,
-  // regionTree
+  applyRegister
 } from "@/api/official";
-// import { getShopUser } from '@/utils/auth'
 export default {
   name: "apply-data",
   components: {
@@ -250,23 +246,18 @@ export default {
       this.form.mobile = val.mobile
     },
     init () {
-      this.$util.getCheckLogin().then(res => {
-        if (res) {
-          if (this.option.introMerchantId) {
-            this._getMerchantDet();
-          }
-        }
-      });
+      this._getMerchantDet()
+
     },
     _getMerchantDet () {
-      getIntroduce({ id: this.option.introMerchantId || 0 }).then(res => {
-        this.merchantData = res.data;
+      getIntroduce(this.option).then(res => {
+        this.merchantData = res.data.introduce
       });
     },
-    // ==============
     confirmFn () {
       applyRegister({
-        shopAdminId: this.option.shopAdminId,
+        hdShopAdminId: this.option.hdShopAdminId,
+        ghsShopAdminId: this.option.ghsShopAdminId,
         ...this.form,
         style: this.option.style || 0,
         from: this.option.from || 0
@@ -287,18 +278,6 @@ export default {
         return false;
       }
       this.showRegion = true;
-      // let that = this
-      // uni.chooseLocation({
-      // 	success: (res) => {
-      // 		this.form.address = res.address
-      // 		this.form.latitude = res.latitude
-      // 		this.form.longitude = res.longitude
-      // 		console.log('位置名称：' + res.name)
-      // 		console.log('详细地址：' + res.address)
-      // 		console.log('纬度：' + res.latitude)
-      // 		console.log('经度：' + res.longitude)
-      // 	}
-      // })
     },
     changeAreaFn (e) {
       console.log("changeAreaFn", e);
@@ -307,16 +286,13 @@ export default {
       this.form.longitude = e.location.lng;
       this.form.dist = e.district
     },
-    // -----
     // 省市联动
     openAddres () {
       this.$refs.simpleAddress.open();
     },
     onCityConfirm (e) {
-      // this.form.receiveAddress = e.label
       this.form.province = e.provinceName;
       this.form.city = e.cityName;
-      // this.pickerText = JSON.stringify(e)
     },
     // 表单验证
     formSubmit (e) {
@@ -336,13 +312,6 @@ export default {
       // 进行表单检查
       let formData = this.form;
       let checkRes = form.validation(formData, rules);
-      // this.$util.pageTo({
-      //     url: "/pagesClient/official/callback",
-      //     type: 2,
-      //     query: {
-      //       pagestatus: 1
-      //     }
-      //   });
       // 验证通过!
       if (!checkRes) {
         setTimeout(() => {
@@ -354,10 +323,6 @@ export default {
     }
   },
   watch: {
-    // imageList(val){
-    //   this.form.
-    //   console.log(val)
-    // }
   }
 };
 </script>

ghsApp/src/pagesClient/official/index.vue

@@ -2,10 +2,10 @@
   <view class="app-content">
     <view class="header_logo">
       <image :src="`${constant.imgUrl}/ghs/home_page/logo.png`" mode="widthFix"></image>
-      <view class="free_register">免费注册</view>
+      <view @click="pageTo({url: '/pagesClient/official/pay',query:{...option}})" class="free_register">免费注册</view>
     </view>
     <view class="main">
-      <image class="banner" :src="`${constant.imgUrl}/ghs/home_page/banner.png`"></image>
+      <image @click="pageTo({url: '/pagesClient/official/pay',query:{...option}})" class="banner" :src="`${constant.imgUrl}/ghs/home_page/banner.png`"></image>
       <image class="pic1" :src="`${constant.imgUrl}/ghs/home_page/pic01.png`"></image>
       <view class="intro">
         <view v-for="(item, index) in list1" :key="index">
@@ -22,7 +22,7 @@
     </view>
     <view class="footer_bar">
       <view class="relation">联系我们</view>
-      <view class="free">免费试用</view>
+      <view @click="pageTo({url: '/pagesClient/official/pay',query:{...option}})" class="free">免费试用</view>
     </view>
   </view>
 </template>

ghsApp/src/pagesClient/official/pay.vue

@@ -76,10 +76,6 @@ export default {
   methods: {
     init() {
       this._getMealDet();
-      let renewOption = uni.getStorageSync("renewOption");
-      if (renewOption) {
-        this.renewOption = JSON.parse(renewOption);
-      }
     },
     _getMealDet() {
       getMealDet({ id: 1 }).then(res => {
@@ -91,12 +87,6 @@ export default {
       });
     },
     wxPay() {
-      renewWxPay({
-        id: this.detail.id,
-        merchantId: this.renewOption.merchantId
-      }).then(res => {
-        wexinPay(res.data, this.paySuccess, this.payFail);
-      });
     },
     // 支付成功
     paySuccess() {

hdApp/src/admin/home/workbench.vue

@@ -6,7 +6,7 @@
         <div class="app-size-28">今日概况</div>
         <view class="open-bt_bx">
           <button
-            @tap="getMyMall('pages/home/index')"
+            @tap="goToMallPt('pages/home/index')"
             class="admin-button-com"
           >
             <i class="iconfont icongouwuche"></i>
@@ -283,21 +283,12 @@ export default {
     };
   },
   onShareAppMessage (res) {
-    if (res.target.id === "shareStore") {
       return {
-        title: "商城分享",
+        title: "",
         desc: "",
         imgUrl: "",
-        path: `/admin/billing/customerPlace?shopId=${this.loginInfo.shopId}`
+        path: ""
       };
-    } else if (res.target.id === "sharePay") {
-      return {
-        title: "分享收款",
-        desc: "",
-        imgUrl: "",
-        path: "pagesShare/pay"
-      };
-    }
   },
   computed: {
     ...mapGetters({ userInfo: "getUser" }),
@@ -313,9 +304,8 @@ export default {
   },
   methods: {
     goPage (item) {
-      console.log(item.url)
       if (item.url === '/admin/billing/priceChange') {
-        this.getMyMall('pages/pay/index')
+        this.goToMallPt('pages/pay/index')
         return
       }
       this.$util.pageTo(item)
@@ -371,18 +361,19 @@ export default {
         type: 2
       });
     },
-    getMyMall (url) {
+    goToMallPt (url) {
+      let self = this
       getWeixinId().then(res => {
         uni.navigateToMiniProgram({
           appId: res.data.mall.miniAppId,
-          path: url + '?account=' + this.loginInfo.shopId, // 
+          path: url + '?account=' + self.loginInfo.shopId,
           //develop 开发板 trial 体验版 release 正式版
           envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
           extraData: {
-            'hdShopAdminId': this.loginInfo.shopAdminId
+            'hdShopAdminId': self.loginInfo.shopAdminId
           },
           success (res) {
-            // 打开成功
+            
           }
         })
       });

hdApp/src/pagesClient/official/index.vue

@@ -85,37 +85,37 @@ export default {
       backgroundImg: `${this.$constant.imgUrl}/retail/official/bg.png`,
       contentData: [
         {
-          title: `<span class="app-color-1">开店更简单</span>`,
-          subTitle: `便捷收集订花人信息，按距离自动算运费，后台一键配送到达达，送到自动通知客户`,
+          title: `<span class="app-color-1">一键开通商城</span>`,
+          subTitle: `线上线下二个门店，店铺管理一个系统，商品节日自动调价，经营管理更方便`,
           img: `${this.$constant.imgUrl}/retail/official/content-1.png`
         },
         {
-          title: `客户<span class="app-color-1">分销</span>`,
+          title: `<span class="app-color-1">客户分销</span>`,
           subTitle: `招募粉丝，不断裂变，通过佣金激励粉丝将商品分享给朋友，实现社群传播，产生订单`,
           img: `${this.$constant.imgUrl}/retail/official/content-4.png`
         },
         {
-          title: `<span class="app-color-1">一键操作 </span>快速涨粉`,
+          title: `<span class="app-color-1">一键操作 快速涨粉</span>`,
           subTitle: `一键操作，快速注册会员，到店客户粉丝转化率提升80%`,
           img: `${this.$constant.imgUrl}/retail/official/content-5.png`
         },
         {
-          title: `精准<span class="app-color-1">管理客户</span>`,
+          title: `<span class="app-color-1">精准管理客户</span>`,
           subTitle: `实现订单和客户分门别类，把握每个客户的个性和特征，精准营销，快速提高客户复购`,
           img: `${this.$constant.imgUrl}/retail/official/content-6.png`
         },
         {
-          title: `<span class="app-color-1">流程化</span>订单管理`,
+          title: `<span class="app-color-1">流程化订单管理</span>`,
           subTitle: `流程化管理订单，下单、制单、发货、配送、送到通知客户，享尊贵开店体验`,
           img: `${this.$constant.imgUrl}/retail/official/content-2.png`
         },
         {
-          title: `丰富多样的<span class="app-color-1">营销工具</span>`,
+          title: `<span class="app-color-1">丰富多样的营销工具</span>`,
           subTitle: `契合花店的营销工具，拉新、转化、复购、裂变，面面俱到`,
           img: `${this.$constant.imgUrl}/retail/official/content-3.png`
         },
         {
-          title: `经营<span class="app-color-1">数据分析</span>`,
+          title: `<span class="app-color-1">经营数据分析</span>`,
           subTitle: `大数据分析客户行为，精准定位高利润项目，投入产出更高效`,
           img: `${this.$constant.imgUrl}/retail/official/content-7.png`
         }

hdApp/src/pagesInvite/list.vue

@@ -121,29 +121,20 @@ export default {
 		}
 	},
 	onShareAppMessage(res) {
-		return
-		if (res.target.id === "shareGhs") {
-			return {
-				title: "更懂您的花卉宝",
-				desc: "",
-				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				path: `pagesClient/official/index?introMerchantId=${this.userInfo.id}&form=2&style=2&shopAdminId=${this.getLoginInfo.shopAdminId}`
-			};
-		} else if (res.target.id === "sharekh") {
-			return {
-				title: "更懂您的花卉宝",
-				desc: "",
-				imgUrl: this.constant.imgUrl + "/retail/official/banner-1.png",
-				path: `pagesClient/official/apply?introMerchantId=${this.userInfo.id}&form=2&style=1`
-			};
-		} else {
-			return {};
-		}
+		return {
+			title: "",
+			desc: "",
+			imgUrl:'',
+			path: ''
+		}	
 	},
 	mounted(){
 	},
 	methods: {
 		inviteGhs(){
+
+			console.log('pagesClient/official/index '+this.loginInfo.shopAdminId)
+
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.ghs.miniAppId,