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

+ 3 - 3
ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
 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'

+ 7 - 8
ghsApp/src/manifest.json

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

+ 3 - 3
hdApp/src/admin/home/workbench.vue

@@ -261,9 +261,9 @@
   </block>
   </block>
 
 
   <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
   <view style="text-align:center;margin-top:50upx;margin-bottom:182upx;color:#827171;font-size:28upx;">
-    <text style="margin-right:20upx;">中花汇提供技术</text>
+    <text style="margin-right:20upx;">中花汇提供技术支持</text>
     <text style="margin-right:20upx;">|</text>
     <text style="margin-right:20upx;">|</text>
-    <text @click="toPhone()">联系技术员</text>
+    <text @click="toPhone()">联系软件公司</text>
   </view>
   </view>
   </view>
   </view>
 
 
@@ -427,7 +427,7 @@ export default {
 			})
 			})
     },
     },
     toPhone(){
     toPhone(){
-			uni.makePhoneCall({ phoneNumber:'15280215347' })
+			this.$util.pageTo({url: '/pagesPurchase/contact'})
 		},
 		},
 		showShopName(){
 		showShopName(){
 			currentShop().then(res => {
 			currentShop().then(res => {

+ 4 - 4
hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
 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'

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
 {
   "extEnable": true,
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "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":"花掌柜"
   }
   }
 }
 }

+ 2 - 3
hdApp/src/manifest.json

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

+ 1 - 0
hdApp/src/pages.json

@@ -426,6 +426,7 @@
 				{ "path": "order", "style": { "navigationBarTitleText": "供货商", "enablePullDownRefresh": true } },
 				{ "path": "order", "style": { "navigationBarTitleText": "供货商", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
 				{ "path": "pb", "style": { "navigationBarTitleText": "已屏蔽商家", "enablePullDownRefresh": true } },
 				{ "path": "open", "style": { "navigationBarTitleText": "商城功能开关", "enablePullDownRefresh": true } },
 				{ "path": "open", "style": { "navigationBarTitleText": "商城功能开关", "enablePullDownRefresh": true } },
+				{ "path": "contact", "style": { "navigationBarTitleText": "联系官方", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "shopping", "style": { "navigationBarTitleText": "采购", "enablePullDownRefresh": true } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct2", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },
 				{ "path": "ghsProduct2", "style": { "navigationBarTitleText": "采购花材", "enablePullDownRefresh": false } },

+ 70 - 0
hdApp/src/pagesPurchase/contact.vue

@@ -0,0 +1,70 @@
+<template>
+  <view class="app-content">
+    <view>
+      <view style="font-size:40upx;font-weight:bold;margin-top:10upx;margin-bottom:10upx;">花材的问题,请通过下图地址找商家:</view>
+      <view style="border:1upx solid #CCCCCC;"><image class="logo" :src="`${constant.imgUrl}/shop/contact_shop.png`" alt mode="widthFix" ></image></view>
+    </view>
+    <view style="font-size:40upx;margin-top:50upx;font-weight:bold;">
+      软件问题,系统问题,申请新商城,请联系软件公司,电话:<text @click="suggest" style="color:#3385ff;margin-left:10upx;">15280215347</text>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "contact",
+  data() {
+    return {
+    };
+  },
+  methods: {
+    init(){
+    },
+    suggest(){
+      let that = this
+      that.$util.confirmModal({content:'号码:15280215347',okText:'复制号码'},() => {
+        uni.setClipboardData({
+          data: '15280215347',
+          success: function() {
+            that.$msg("复制成功")
+          }
+        })
+			})
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 20upx);
+  padding-top: 20upx;
+  padding-left:10upx;
+  padding-right:10upx;
+}
+.prompt-text {
+  color: $fontColor3;
+  padding-left: 30upx;
+  margin-bottom: 30upx;
+}
+.module-com {
+  margin-bottom: 20upx;
+  .member-wrap {
+    .member-det {
+      font-size: 24upx;
+      margin-left: 20upx;
+    }
+  }
+  .remark-wrap {
+    align-items: flex-start;
+    .remark {
+      height: 240upx;
+    }
+  }
+}
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 60upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
   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 {
 .iconfont {