广告

ghsApp/src/admin/billing/result.vue

@@ -15,6 +15,11 @@
 	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail">订单详情</button>
   <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
+
+  <!-- #ifdef MP-WEIXIN -->
+  <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+  <!-- #endif -->
+
   <view style="margin-top:50upx;">
     <block v-for="(item, index) in detailInfo.product" :key="index">
       <view style="text-align:center;margin-bottom:10upx;">

ghsApp/src/admin/home/apply.vue

@@ -6,6 +6,11 @@
 	<block v-else>
 
     <view class="apply-content_box">
+
+        <!-- #ifdef MP-WEIXIN -->
+        <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+        <!-- #endif -->
+
         <view v-for="item in menuList" :key="item.title" class="apply-list_box">
             <view class="tit">
                 {{item.title}}

ghsApp/src/admin/home/me.vue

@@ -70,6 +70,10 @@
           </view>
         </view>
 
+        <!-- #ifdef MP-WEIXIN -->
+        <ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+        <!-- #endif -->
+
         <view class="module-com content_box user-open_bx">
           <view class="input-line-wrap">
 

ghsApp/src/admin/home/workbench.vue

@@ -32,15 +32,20 @@
 
   <block v-if="loginStyle  == 0">
 	<!-- #ifdef MP-WEIXIN -->
-    <view style="width:100vw;height:300upx;display:flex;align-items:center;justify-content:center;position:relative;">
+    <view style="width:100vw;height:240upx;display:flex;align-items:center;justify-content:center;position:relative;">
       <button class="admin-button-com big blue" style="width:260upx;" @click="buyItem()">花店买花</button>
     </view>
 	<!-- #endif -->
-    <view style="width:100vw;height:300upx;display:flex;align-items:center;justify-content:center;position:relative;">
+    <view style="width:100vw;height:240upx;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>
-		<text style="color:green;position:absolute;top:260upx;font-size:32upx;text-decoration: underline;" @click="pageTo({url:'/pagesClient/official/apply'})">批发店注册</text>
-		<text style="color:green;position:absolute;top:350upx;font-size:32upx;text-decoration: underline;" @click.stop="toPhone()">联系官方</text>
+		<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>
     </view>
+
+	<!-- #ifdef MP-WEIXIN -->
+	<ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+    <!-- #endif -->
+
   </block>
   <block v-else>
 
@@ -137,6 +142,9 @@
 
 		</view>
 
+		<!-- #ifdef MP-WEIXIN -->
+		<ad-custom unit-id="adunit-3a7cda7bc692514a"></ad-custom>
+		<!-- #endif -->
 
 		<div class="module-com total-wrap">
 			<div class="total-tit">总览</div>

ghsApp/src/components/app-result.vue

@@ -33,7 +33,7 @@ export default {
 <style lang="scss" scoped>
 .billing_box_bg {
 	position: relative;
-	padding: 60upx 30upx;
+	padding: 20upx 30upx;
 	display: flex;
 	background: white;
 	flex-direction: column;
@@ -52,24 +52,23 @@ export default {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding: 70upx;
+		padding: 30upx 70upx 70upx 70upx;
 		width: 100%;
 		background: #ffffff;
 		border-radius: 20upx;
 		z-index: 1;
 		.iconchenggong {
-			font-size: 170upx;
+			font-size: 120upx;
 			color: $mainColor1;
 		}
-    .icondaizhifu {
-			font-size: 170upx;
+    	.icondaizhifu {
+			font-size: 150upx;
 			color: #ffa92e;
 		}
 		.result-title {
-			margin: 50upx 0 70upx;
-			font-size: 32upx;
+			margin: 25upx 0 40upx;
+			font-size: 30upx;
 		}
 	}
-	
 }
 </style>

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.wixhb.com'
+export const IMGHOST = 'https://img.wixhb.com'
+export const CURRENT_ENV = 'production'

ghsApp/src/manifest.json

@@ -62,7 +62,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }          
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
@@ -172,20 +172,19 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（销花宝） wxcf32b3f0684c2433 开发（花掌柜） wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -214,7 +213,7 @@
             "port" : 81,
             "proxy" : {
                 "/api" : {
-                    "target" : "http://api.shop.hzghd.com",
+                    "target" : "http://api.shop.wixhb.com",
                     "secure" : false,
                     "changeOrigin" : true,
                     "pathRewrite" : {

hdApp/src/admin/home/apply.vue

@@ -1,6 +1,11 @@
 <template>
   <view class="app-content">
     <view class="apply-content_box">
+
+      <!-- #ifdef MP-WEIXIN -->
+      <ad-custom unit-id="adunit-22b6fe92acad433e"></ad-custom>
+      <!-- #endif -->
+
       <view v-for="item in menuList" :key="item.title" class="apply-list_box" >
         <view class="tit"> {{item.title}} </view>
         <div class="tabs-wrap">

hdApp/src/admin/home/me.vue

@@ -45,6 +45,10 @@
         </view>
         </template>
 
+        <!-- #ifdef MP-WEIXIN -->
+        <ad-custom unit-id="adunit-22b6fe92acad433e"></ad-custom>
+        <!-- #endif -->
+
         <view class="module-com content_box user-open_bx">
           <view class="input-line-wrap">
 

hdApp/src/admin/home/workbench.vue

@@ -100,9 +100,6 @@
       <image @click="goGd()" :src="kdSrc" mode="widthFix" ></image>
       <image @click="goShKd()" :src="shSrc" mode="widthFix"></image>
     </view>
-    <!-- #ifdef MP-WEIXIN -->
-    <ad-custom unit-id="adunit-22b6fe92acad433e"></ad-custom>
-    <!-- #endif -->
     <div class="tabs-wrap">
       <div class="tabs-list" v-for="(item, index) in tabsData" :key="index" >
         <div @click="goPage(item)">
@@ -115,6 +112,10 @@
     </div>
   </view>
 
+  <!-- #ifdef MP-WEIXIN -->
+  <ad-custom unit-id="adunit-22b6fe92acad433e"></ad-custom>
+  <!-- #endif -->
+
 	<template v-if="lookMoney == 1">
       <div class="module-com total-wrap">
         <div class="total-tit">总览</div>

hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
-export const CURRENT_ENV = 'dev'
+export const APIHOST = 'https://api.shop.huahb.cn'
+export const FORMALHOST = 'https://shop.huahb.cn'
+export const IMGHOST = 'https://img.huahb.cn'
+export const CURRENT_ENV = 'production'

hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花掌柜"
   }
 }

hdApp/src/manifest.json

@@ -152,7 +152,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上（花掌柜） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },
@@ -164,8 +164,7 @@
         },
         "optimization" : {
             "subPackages" : true
-        },
-        "lazyCodeLoading":"requiredComponents"
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true

hdApp/src/pagesPurchase/particulars.vue

@@ -241,17 +241,17 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 30upx 70upx 70upx 70upx;
+    padding: 20upx 70upx 0upx 70upx;
     width: 100%;
     background: #ffffff;
-    border-radius: 20upx;
+    border-radius: 20upx 20upx 0upx 0upx;
     z-index: 1;
     .iconchenggong {
-      font-size: 170upx;
+      font-size: 120upx;
       color: $mainColor1;
     }
     .result-title {
-      margin: 20upx 0 50upx;
+      margin: 20upx 0 30upx;
       font-size: 32upx;
     }
     .close_btn {

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {