门店优化

ghsApp/src/admin/shop/add.vue

@@ -99,14 +99,14 @@
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">显示库存</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '是' : '否'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.showStock == 0 ? false : true" @change="showStockChange" /> {{form.showStock==1 ? '新客户可以看库存' : '新客户不能看库存'}}
 					</view>
 				</tui-list-cell>
 
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">允许欠款</view>
 					<view>
-						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '不允许' : '允许'}}
+						<switch style="transform:scale(0.7,0.7)" :checked="form.allowDebt == 0 ? false : true" @change="allowDebtChange" /> {{form.allowDebt==0 ? '新客户不能欠款' : '新客户允许欠款'}}
 					</view>
 				</tui-list-cell>
 

hdApp/src/pagesClient/official/result.vue

@@ -41,6 +41,9 @@ export default {
 
     },
     methods:{
+      init(){
+
+      },
       beginCg(){
         if(this.fromCg == 1){
           let ghsCgOption = uni.getStorageSync('ghsCgOption')

hdApp/src/pagesPurchase/components/person.vue

@@ -1,8 +1,9 @@
 <template>
   <view class="model" v-if="isHd == 0">
-    <view style="color:white;font-size:38upx;">此为花店买花入口</view>
-    <view style="color:white;font-size:38upx;margin-top:40upx;">个人请点下方商城去买花哦</view>
-    <view class="open-mall" @click="goToMall">个人商城</view>
+    <view style="color:white;font-size:38upx;">此花店买花入口</view>
+    <view style="color:white;font-size:38upx;margin-top:40upx;">您不是花店，没有权限查看哦</view>
+    <view style="color:white;font-size:38upx;margin-top:40upx;">您也可以点下方去零售商城买花</view>
+    <view class="open-mall" @click="goToMall">买花入口</view>
   </view>
 </template>
 <script>
@@ -39,7 +40,7 @@ export default {
   color: #fff;
   overflow: hidden;
   text-align: center;
-  padding-top:26vh;
+  padding-top:16vh;
   & > .noData_img {
     width: 318upx;
     height: 318upx;
@@ -57,7 +58,7 @@ export default {
     line-height:110upx;
     background: linear-gradient(90deg, #3385ff, #33b0ff);
     border-radius: 44upx;
-    margin: 40upx auto;
+    margin: 50upx auto;
     font-size: 34upx;
     font-weight:bold;
     color: #ffffff;

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -21,8 +21,8 @@
 				<app-search-module v-model="py" placeholder="拼音首字母也可以搜索" @input="searchFn" />
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" v-if="ghsInfo.presell && ghsInfo.presell == 1" style="background-color:green;border:1upx solid green;" @click="aheadCg(ghsInfo)">提前订花</button>
-				<button class="admin-button-com middle blue" v-else @click="delMemory()">清空已选</button>
+				<button class="admin-button-com middle blue" v-if="1 == 2" style="background-color:green;border:1upx solid green;" @click="aheadCg(ghsInfo)">提前订花</button>
+				<button class="admin-button-com middle blue" @click="delMemory()">清空已选</button>
 			</view>
 		</view>
 
@@ -107,6 +107,7 @@
 
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" @showCartItem="showCartItem"></FooterCart>
 		<wangCg :show.sync="notOpenShop" @bthClick="goToCg()"></wangCg>
+		<personComponent :isHd.sync="isHd" @goToMall="goToMall()"></personComponent>
     	<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
 		<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
 
@@ -157,7 +158,7 @@
 		</view>
 		</uni-popup>
 
-		<image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image>
+		<!-- <image v-if="showClassRemind" @click="hideClassRemind" style="position:absolute;width:610upx;height:699upx;top:225upx;left:80upx;z-index:9999;" :src="`${constant.imgUrl}/class_remind.png`"></image> -->
 
 		<view v-if="ghsInfo.black && ghsInfo.black == 2" style="position:fixed;bottom:180upx;z-index:99999;
 		font-weight:bold;font-size:36upx;
@@ -184,6 +185,7 @@ import productMins from "@/mixins/cgProduct";
 import { getGhsDataApi, ghsInfo,visitMall,getClassRemind,hasClassRemind } from "@/api/ghs";
 import SelPopup from "@/components/sel-popup.vue";
 import { getWeixinId } from "@/api/invite";
+import personComponent from "./components/person";
 import AppActivilyCoupon from "@/components/module/app-activily-coupon";
 import { mapGetters } from "vuex";
 export default {
@@ -198,7 +200,8 @@ export default {
 		allMoreSelectInput,
 		PxClassCommondity,
 		wangCg,SelPopup,
-		AppActivilyCoupon
+		AppActivilyCoupon,
+		personComponent
 	},
 	props: {
 		ghsShopAdminId:{