选择

ghsApp/src/admin/home/me.vue

@@ -37,10 +37,10 @@
         </view>
         <view class="account-info_box content_box">
           <view class="info-lf_box">
-            <view> 账户余额(元) </view>
+            <view> 账户余额（元） </view>
             <view> <text>¥ </text> {{ shopInfo.balance||0 }} </view>
             <view>
-              可提现余额 ¥ {{ shopInfo.txBalance||0 }}
+              可提现 ¥ {{ shopInfo.txBalance||0 }}
               <text v-if="shopInfo.txBalance > 0" @click="checkToApplyCash" class="to-cash" >提现</text>
             </view>
           </view>

ghsApp/src/mixins/globalMixins.js

@@ -62,6 +62,9 @@ export default {
       if(this.$util.isEmpty(token)){
         if(currentRoute == 'admin/home/workbench'){
           wxMiniLogin(true).then(res => {
+						//用于开启小程序自动登录
+						let currentMiniOpenId = res.data.currentMiniOpenId || ''
+						uni.setStorageSync('currentMiniOpenId', currentMiniOpenId)
             let token = res.token || ''
             if (!this.$util.isEmpty(token)) {
               getUser(true)

hdApp/src/api/apply/index.js

@@ -13,4 +13,9 @@ export const applyInviteGhsPoster = name => {
  */
  export const applyInviteHdPoster = name => {
 	return https.get("/apply/invite-hd-poster", { name });
+};
+
+//获取验证码
+export const getAuthCode = data => {
+	return https.get("/apply/get-auth-code", data);
 };

hdApp/src/mixins/globalMixins.js

@@ -40,7 +40,7 @@ export default {
 			let currentRoute  = pages[pages.length-1].route;
 			let token = uni.getStorageSync('token')
 			if(this.$util.isEmpty(token)){
-				if(currentRoute == 'admin/home/workbench'){
+				if(currentRoute == 'admin/home/workbench' || currentRoute == 'pagesPurchase/ghsProduct'){
 					wxLoginFn(true).then(res => {
 						let token = res.data.token || ''
 						//用于开启小程序自动登录

hdApp/src/pages.json

@@ -50,7 +50,7 @@
 				{ "path": "official/index", "style": { "navigationBarTitleText": "花惠宝" } },
 				{ "path": "official/pay", "style": { "navigationBarTitleText": "支付" } },
 				{ "path": "official/renewal", "style": { "navigationBarTitleText": "续期" } },
-				{ "path": "official/apply", "style": { "navigationBarTitleText": "完善我的信息" } },
+				{ "path": "official/apply", "style": { "navigationBarTitleText": "完善店铺信息" } },
 				{ "path": "official/clientApply", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "official/clientResult", "style": { "navigationBarTitleText": "提交审核" } },
 				{ "path": "official/callback", "style": { "navigationBarTitleText": "回调" } },

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -33,7 +33,7 @@
 				<app-search-module v-model="py" placeholder="输字母找花材，如小菊输xj" @input="searchFn" />
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="removeMemory(option.id)">清除采购</button>
+				<button class="admin-button-com middle blue" @click="removeMemory(option.id)">清除已选</button>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">
@@ -113,14 +113,9 @@
 		</modal-module>
 
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" ></FooterCart>
-		<wangCg :show.sync="notOpenShop" @bthClick="toPage"></wangCg>
+		<wangCg :show.sync="notOpenShop" @bthClick="goToCg()"></wangCg>
     	<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
-
-		<app-activily-coupon
-		:show.sync="isNewCustom"
-		:info="newCustomGift"
-		:ghsId="ghsId"
-		/>
+		<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
 
 	</view>
 </template>
@@ -142,8 +137,9 @@ import productMins from "@/mixins/product";
 import { getGhsDataApi, ghsInfo,visitMall } from "@/api/ghs/index";
 import SelPopup from "@/components/sel-popup.vue";
 import AppActivilyCoupon from "@/components/module/app-activily-coupon";
+import { mapGetters } from "vuex";
 export default {
-	name: "cgProduct", // 开单
+	name: "cgProduct",
 	components: {
 		AppTabs,
 		AppSearchModule,
@@ -203,16 +199,10 @@ export default {
 		});
 	},
 	computed: {
-		confirmContent() {
-			let content = "确认下一步？";
-			if (this.hasNoStock) {
-				content = "有花材库存不足，确认下一步？";
-			}
-			return content;
-		},
+      	...mapGetters({ loginInfo: "getLoginInfo" }),
 		//判断是否已经开店 shish 2021.4.22
 		ifOpenShop(){
-			if(this.loginInfo.shopAdminId == 0){
+			if(this.$util.isEmpty(this.loginInfo)){
 				this.notOpenShop = true
 			}else{
 				this.hdShopAdminId = this.loginInfo.shopAdminId
@@ -221,8 +211,6 @@ export default {
 	},
 	onShow(){
 		if(this.xjData.hasUpdate == 1){
-			console.log('this.xjData',this.xjData)
-			console.log('this.xjDataInfo',this.xjDataInfo)
 
 			const list = this.selectList;
 
@@ -426,16 +414,8 @@ export default {
 				this.isFocus = true;
 			})
 		},
-		toPage() {
-			this.$util.pageTo({
-				url: "/pagesClient/official/apply",
-				type: 2,
-				query: {
-					ghsShopAdminId: this.ghsShopAdminId,
-					hdShopAdminId: this.hdShopAdminId,
-					fromGhsId:this.fromGhsId
-				},
-			});
+		goToCg() {
+			this.$util.pageTo({ url: "/pagesClient/official/apply",query:{ghsShopAdminId:this.ghsShopAdminId,hdShopAdminId:this.hdShopAdminId,fromGhsId:this.fromGhsId}})
 		},
 		// 拨打电话  wangn  2021-5-6
 		toPhone(phone){
@@ -525,7 +505,6 @@ export default {
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
 
-
 				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
 				let selectList = this.selectList;
 				let list = [];