shish 1 год назад
Родитель
Сommit
3336be9341

+ 4 - 2
ghsApp/src/admin/billing/result.vue

@@ -17,11 +17,13 @@
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
 
 
   <!-- #ifdef MP-WEIXIN -->
   <!-- #ifdef MP-WEIXIN -->
-  <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+  <ad-custom unit-id="adunit-42a99bd9e25e3626" style="width:688upx;"></ad-custom>
+  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
   <!-- #endif -->
   <!-- #endif -->
 
 
   <!-- #ifdef APP-PLUS -->
   <!-- #ifdef APP-PLUS -->
-  <ad adpid="1806928014" style="width:750upx;"></ad>
+  <ad adpid="1087249477" style="width:688upx;"></ad>
+  <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
   <!-- #endif -->
   <!-- #endif -->
 
 
   <view style="margin-top:50upx;">
   <view style="margin-top:50upx;">

+ 2 - 2
ghsApp/src/admin/home/apply.vue

@@ -9,13 +9,13 @@
 
 
         <!-- #ifdef MP-WEIXIN -->
         <!-- #ifdef MP-WEIXIN -->
         <view style="margin-bottom:20upx;background-color: white;">
         <view style="margin-bottom:20upx;background-color: white;">
-        <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+        <ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
         </view>
         </view>
         <!-- #endif -->
         <!-- #endif -->
 
 
         <!-- #ifdef APP-PLUS -->
         <!-- #ifdef APP-PLUS -->
         <view style="margin-bottom:20upx;background-color: white;">
         <view style="margin-bottom:20upx;background-color: white;">
-        <ad adpid="1806928014"></ad>
+        <ad adpid="1087249477"></ad>
         </view>
         </view>
         <!-- #endif -->
         <!-- #endif -->
 
 

+ 8 - 6
ghsApp/src/admin/home/me.vue

@@ -8,7 +8,10 @@
         </view>
         </view>
       </view>
       </view>
 
 
-      <view class="me-shop_box" v-if="getLoginInfo.staff && getLoginInfo.staff.identity!=2">
+      <view v-if="getLoginInfo.staff && getLoginInfo.staff.identity==2">
+        <view @click="loginOut()" style="margin-top:300upx;font-size:36upx;font-weight:bold;">退出登录</view>
+      </view>
+      <view class="me-shop_box" v-else>
         <view class="me-shop_content content_box">
         <view class="me-shop_content content_box">
           <view class="me-shop_top">
           <view class="me-shop_top">
             <view class="shop-top_left">
             <view class="shop-top_left">
@@ -72,13 +75,13 @@
 
 
         <!-- #ifdef MP-WEIXIN -->
         <!-- #ifdef MP-WEIXIN -->
         <view style="margin-top:20upx;background-color: white;">
         <view style="margin-top:20upx;background-color: white;">
-        <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+        <ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
         </view>
         </view>
         <!-- #endif -->
         <!-- #endif -->
 
 
         <!-- #ifdef APP-PLUS -->
         <!-- #ifdef APP-PLUS -->
         <view style="margin-top:20upx;background-color: white;">
         <view style="margin-top:20upx;background-color: white;">
-        <ad adpid="1806928014"></ad>
+        <ad adpid="1087249477"></ad>
         </view>
         </view>
         <!-- #endif -->
         <!-- #endif -->
 
 
@@ -168,9 +171,8 @@
         <view class="bottom-version">闽ICP备15017325号-12A</view>
         <view class="bottom-version">闽ICP备15017325号-12A</view>
 
 
       </view>
       </view>
-      <view v-else>
-        <view @click="loginOut()" style="margin-top:300upx;font-size:36upx;font-weight:bold;">退出登录</view>
-      </view>
+
+
     </template>
     </template>
     <ShopSelect ref="shopSelectComponent" class="bar" :isShowTit="false" top="0upx" @selectShopFn="selectShopFn" />
     <ShopSelect ref="shopSelectComponent" class="bar" :isShowTit="false" top="0upx" @selectShopFn="selectShopFn" />
     <NotLogin></NotLogin>
     <NotLogin></NotLogin>

+ 12 - 8
ghsApp/src/admin/home/workbench.vue

@@ -32,22 +32,26 @@
 
 
   <block v-if="loginStyle  == 0">
   <block v-if="loginStyle  == 0">
 	<!-- #ifdef MP-WEIXIN -->
 	<!-- #ifdef MP-WEIXIN -->
-    <view style="width:100vw;height:240upx;display:flex;align-items:center;justify-content:center;position:relative;">
+    <view style="width:100vw;height:160upx;display:flex;align-items:center;justify-content:center;position:relative;">
       <button class="admin-button-com big blue" style="width:260upx;" @click="buyItem()">花店买花</button>
       <button class="admin-button-com big blue" style="width:260upx;" @click="buyItem()">花店买花</button>
     </view>
     </view>
 	<!-- #endif -->
 	<!-- #endif -->
-    <view style="width:100vw;height:240upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
+    <view style="width:100vw;height:220upx;display:flex;align-items:center;justify-content:center;position:relative;margin-bottom:170upx;">
 		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">批发店登录</button>
 		<button class="admin-button-com big blue" style="width:260upx;" @click="pageTo({url:'/admin/home/login'})">批发店登录</button>
-		<text style="color:green;position:absolute;top:225upx;font-size:32upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
-		<text style="color:green;position:absolute;top:315upx;font-size:32upx;text-decoration: underline;" @click.stop="toPhone()">联系官方技术员</text>
+		<text style="color:green;position:absolute;top:190upx;font-size:33upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
+		<text style="color:green;position:absolute;top:280upx;font-size:33upx;text-decoration: underline;" @click.stop="toPhone()">联系官方技术员</text>
     </view>
     </view>
 
 
 	<!-- #ifdef MP-WEIXIN -->
 	<!-- #ifdef MP-WEIXIN -->
-	<ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+	<view style="width:100vw;height:25upx;background-color: #ece5e5;"></view>
+	<ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
+	<view style="width:100vw;height:25upx;background-color: #ece5e5;"></view>
     <!-- #endif -->
     <!-- #endif -->
 
 
 	<!-- #ifdef APP-PLUS -->
 	<!-- #ifdef APP-PLUS -->
-	<ad adpid="1806928014"></ad>
+	<view style="width:100vw;height:25upx;background-color: #ece5e5;"></view>
+	<ad adpid="1087249477"></ad>
+	<view style="width:100vw;height:25upx;background-color: #ece5e5;"></view>
 	<!-- #endif -->
 	<!-- #endif -->
 
 
   </block>
   </block>
@@ -148,13 +152,13 @@
 
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- #ifdef MP-WEIXIN -->
 		<view style="margin-bottom:20upx;background-color: white;">
 		<view style="margin-bottom:20upx;background-color: white;">
-		<ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+		<ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
 		</view>
 		</view>
 		<!-- #endif -->
 		<!-- #endif -->
 
 
 		<!-- #ifdef APP-PLUS -->
 		<!-- #ifdef APP-PLUS -->
 		<view style="margin-bottom:20upx;background-color: white;">
 		<view style="margin-bottom:20upx;background-color: white;">
-			<ad adpid="1806928014"></ad>
+			<ad adpid="1087249477"></ad>
 		</view>
 		</view>
 		<!-- #endif -->
 		<!-- #endif -->
 
 

+ 10 - 10
ghsApp/src/pagesClient/member/detail.vue

@@ -173,17 +173,17 @@
         </view>
         </view>
 
 
 
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="margin-bottom:20upx;background-color: white;">
-      <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
-      </view>
-      <!-- #endif -->
+        <!-- #ifdef MP-WEIXIN -->
+        <view style="margin-bottom:20upx;background-color: white;">
+        <ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
+        </view>
+        <!-- #endif -->
 
 
-      <!-- #ifdef APP-PLUS -->
-      <view style="margin-bottom:20upx;background-color: white;">
-        <ad adpid="1806928014"></ad>
-      </view>
-      <!-- #endif -->
+        <!-- #ifdef APP-PLUS -->
+        <view style="margin-bottom:20upx;background-color: white;">
+          <ad adpid="1087249477"></ad>
+        </view>
+        <!-- #endif -->
 
 
 
 
       </view>
       </view>

+ 2 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -368,13 +368,13 @@
 
 
 		<!-- #ifdef MP-WEIXIN -->
 		<!-- #ifdef MP-WEIXIN -->
 		<view style="margin-bottom:20upx;background-color: white;">
 		<view style="margin-bottom:20upx;background-color: white;">
-		<ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+		<ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
 		</view>
 		</view>
 		<!-- #endif -->
 		<!-- #endif -->
 
 
 		<!-- #ifdef APP-PLUS -->
 		<!-- #ifdef APP-PLUS -->
 		<view style="margin-bottom:20upx;background-color: white;">
 		<view style="margin-bottom:20upx;background-color: white;">
-			<ad adpid="1806928014"></ad>
+			<ad adpid="1087249477"></ad>
 		</view>
 		</view>
 		<!-- #endif -->
 		<!-- #endif -->
 
 

+ 10 - 10
ghsApp/src/pagesPurchase/info.vue

@@ -250,17 +250,17 @@
 				</div>
 				</div>
 			</view>
 			</view>
 
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="margin-bottom:20upx;background-color: white;">
-      <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
-      </view>
-      <!-- #endif -->
+			<!-- #ifdef MP-WEIXIN -->
+			<view style="margin-bottom:20upx;background-color: white;">
+			<ad-custom unit-id="adunit-42a99bd9e25e3626"></ad-custom>
+			</view>
+			<!-- #endif -->
 
 
-      <!-- #ifdef APP-PLUS -->
-      <view style="margin-bottom:20upx;background-color: white;">
-        <ad adpid="1806928014"></ad>
-      </view>
-      <!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view style="margin-bottom:20upx;background-color: white;">
+				<ad adpid="1087249477"></ad>
+			</view>
+			<!-- #endif -->
 
 
 		</view>
 		</view>
 
 

+ 1 - 1
hdApp/src/pagesPurchase/components/wangCg.vue

@@ -3,7 +3,7 @@
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <view style="margin:45upx 0;color:white;font-size:34upx;">首次下单,请填写门店信息</view>
     <view style="margin:45upx 0;color:white;font-size:34upx;">首次下单,请填写门店信息</view>
     <view class="freeApply" @click="apply">填写</view>
     <view class="freeApply" @click="apply">填写</view>
-    <view style="margin:55upx 0;color:white;font-size:33upx;" @click="goLogin()">
+    <view style="margin:55upx 0;color:white;font-size:36upx;" @click="goLogin()">
       <text style="text-decoration:underline;">直接登录</text>
       <text style="text-decoration:underline;">直接登录</text>
     </view>
     </view>
     <view style="margin:55upx 0;color:white;font-size:29upx;" >如您的伙伴需要买花,请联系批发店添加员工</view>
     <view style="margin:55upx 0;color:white;font-size:29upx;" >如您的伙伴需要买花,请联系批发店添加员工</view>