请选择城市

store/src/admin/home/workbench.vue

@@ -224,11 +224,6 @@ export default {
           name: "设置",
           img: `${this.$constant.imgUrl}/retail/admin/tab-icon-8.png`,
           url: "/admin/setting/list"
-        },
-        {
-          name: "花卉宝",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-7.png`,
-          url: "/admin/official/index"
         }
       ],
       // 总览

store/src/admin/interest/my-invite.vue

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

store/src/admin/official/apply.vue

@@ -7,9 +7,10 @@
           <input
             v-model="form.name"
             placeholder-class="phcolor"
+            placeholder-style="color:#CCCCCC"
             class="tui-input"
             name="name"
-            placeholder="请输入姓名"
+            placeholder="请输入花店名称"
           />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="openAddres">
@@ -27,6 +28,7 @@
           <input
             v-model="form.floor"
             placeholder-class="phcolor"
+            placeholder-style="color:#CCCCCC"
             class="tui-input"
             name="floor"
             placeholder="楼号门牌号（选填）"
@@ -36,8 +38,8 @@
       <!-- 店长昵称 -->
       <div class="module-com">
         <tui-list-cell class="line-cell code-wrap" :hover="false">
-          <div class="tui-title">店长昵称</div>
-          <div class="tui-code" style="width:260rpx;">{{nickname}}</div>
+          <div class="tui-title">我的昵称</div>
+          <div class="tui-code" style="width:260rpx;">{{nickName}}</div>
           <button
             class="admin-button-com blue mini-btn"
             open-type="getUserInfo"
@@ -48,7 +50,7 @@
       <!-- 手机号 -->
       <div class="module-com">
         <tui-list-cell class="line-cell code-wrap" :hover="false">
-          <div class="tui-title">手机号</div>
+          <div class="tui-title">我的手机号</div>
           <div class="tui-code" style="width:260rpx;">{{form.mobile}}</div>
           <button
             class="admin-button-com blue mini-btn"
@@ -59,7 +61,7 @@
       </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">
@@ -131,7 +133,7 @@ export default {
       isSend: 0,
       countDown: 119,
       timer: null,
-      nickname: ""
+      nickName: ""
     };
   },
   onLoad() {
@@ -225,11 +227,10 @@ export default {
         provider: "weixin",
         success: res => {
           console.log("res", res);
-          // this.popupShow = true
           getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
             subRes => {
               this.form.adminId = subRes.data.id;
-              this.nickname = subRes.data.nickname;
+              this.nickName = subRes.data.nickName;
               uni.showToast({
                 icon: "success"
               });
@@ -256,7 +257,7 @@ export default {
     // 选择地址
     selRegionFn() {
       if (!this.form.city) {
-        this.$msg("请先选择地址！");
+        this.$msg("请先选择城市！");
         return false;
       }
       this.showRegion = true;

store/src/admin/official/index.vue

@@ -26,13 +26,21 @@
       </div>
       <div class="ad-list-wrap">
         <div class="ad-list" v-for="(item, index) in adData" :key="index">
-          <app-img :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`" mode="widthFix" alt="他们都在用" />
+          <app-img
+            :src="`${constant.imgUrl}/retail/official/list-${index + 1}.png`"
+            mode="widthFix"
+            alt="他们都在用"
+          />
         </div>
       </div>
       <div class="official-wrap">
         <div class="off-title">花卉宝，花店数字化建设者</div>
         <div class="off-sub-tit" @click="contactFn">
-          <app-img :src="`${constant.imgUrl}/retail/official/phone-small.png`" alt="电话" mode="widthFix" />
+          <app-img
+            :src="`${constant.imgUrl}/retail/official/phone-small.png`"
+            alt="电话"
+            mode="widthFix"
+          />
           <span>咨询热线：0592 - 3272000</span>
         </div>
       </div>
@@ -59,7 +67,6 @@
 <script>
 import AppSwiper from "@/components/app-swiper";
 import AppImg from "@/components/app-img";
-// api
 import { applyStatus } from "@/api/official";
 import { share } from "@/mixins";
 export default {
@@ -150,22 +157,11 @@ export default {
       }
 
       //花店分享的页面有邀人，打开页面保存邀请人
-
-      // #ifdef H5
-      //sessionStorage.setItem('introMerchantId', this.option.introMerchantId)
-      // #endif
       let introMerchantId =
         typeof this.option.introMerchantId == "undefined"
           ? 0
           : this.option.introMerchantId;
       uni.setStorageSync("introMerchantId", introMerchantId);
-
-      // let token = uni.getStorageSync('token')
-      // if (token) {
-      // 	this._getDet()
-      // } else {
-      // 	this.status = -1
-      // }
     },
     _getDet() {
       applyStatus().then(res => {

store/src/admin/shop/add.vue

@@ -132,7 +132,7 @@
 			// 选择地址
 			selRegionFn() {
 				if (!this.form.city) {
-					this.$msg('请先选择地址！')
+					this.$msg('请先选择城市！')
 					return false
 				}
 				this.showRegion = true

store/src/components/app-delivery.vue

@@ -231,7 +231,7 @@ export default {
     // 选择地址
     selRegionFn() {
       if (!this.form.receiveCity) {
-        this.$msg("请先选择地址！");
+        this.$msg("请先选择城市！");
         return false;
       }
       this.showRegion = true;