优化

hdApp/src/admin/billing/affirmGhs.vue

@@ -69,6 +69,15 @@
 		<button class="admin-button-com middle" :class="[form.transType == 5 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;font-size:23upx;"  @click="changeTransType(5)">到店自取</button>
 	</tui-list-cell>
 
+	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-else-if="ghsInfo.shopId == 16781">
+		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 1 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(1)">顺丰物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 2 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(2)">冷链物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 3 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;" @click="changeTransType(3)">航空物流</button>
+		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
+		<button class="admin-button-com middle" :class="[form.transType == 5 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;font-size:23upx;"  @click="changeTransType(5)">到店自取</button>
+	</tui-list-cell>
+
 	<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-else>
 		<button class="admin-button-com middle" :class="[form.transType == 4 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(4)">同城配送</button>
 		<button class="admin-button-com middle" :class="[form.transType == 0 ? 'blue' : 'default']" style="width:115upx;height:100upx;line-height:32upx;margin-right:11upx;font-size:23upx;"  @click="changeTransType(0)">德邦物流</button>
@@ -665,6 +674,9 @@ export default {
 				if(res.data && res.data.shopId == 14636){
 					//花瀚鲜花供应链默认冷链
 					this.changeTransType(2)
+				}else if(res.data && res.data.shopId == 16781){
+					//云中花花卉默认德邦
+					this.changeTransType(0)
 				}else{
 					this.changeTransType(4)
 				}

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/order.vue

@@ -142,7 +142,7 @@ export default {
     }
   },
   onPullDownRefresh() {
-    this.getGHSList().then(res => {
+    this.getGhsList().then(res => {
       uni.stopPullDownRefresh();
     })
   },
@@ -208,7 +208,7 @@ export default {
       changeDelStatus({delStatus:1,ghsId:ghs.id}).then(res=>{
         if(res.code == 1){
           that.closeToShow()
-          that.getGHSList()
+          that.getGhsList()
         }
       })
     },
@@ -227,9 +227,9 @@ export default {
       this.$util.confirmModal({content:'付款金额不足消欠款单时，存为余额下次使用'},() => {})
     },
     init() {
-      this.getGHSList()
+      this.getGhsList()
     },
-    getGHSList () {
+    getGhsList () {
       return ghsList().then(res => {
         this.supplierList = res.data.list
         this.ad = res.data.ad ? res.data.ad : []

hdApp/src/pagesPurchase/pb.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="ghs_list_page flex-col">
-    <template v-if="!$util.isEmpty(supplierList)">
+    <template v-if="!$util.isEmpty(list.data)">
     <view class="ghs_list_area flex-col justify-end">
       
-        <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in supplierList" :key="index">
+        <view class="ghs_box flex-col justify-end" v-for="(ghsInfo, index) in list.data" :key="index">
           <view class="image-text_7 flex-row justify-between">
             <view class="section_1 flex-col">
               <image class="logo" :src="ghsInfo.avatar" />
@@ -44,17 +44,27 @@
 import emptyComponent from "@/components/empty";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
+import { list } from "@/mixins";
 export default {
   components: {
     emptyComponent
   },
+  mixins: [list],
   data () {
     return {
-      supplierList: []
+    }
+  },
+  onReachBottom () {
+    if (!this.list.finished) {
+      this.getGhsList().then(res => {
+        uni.stopPullDownRefresh()
+      });
+    } else {
+      uni.stopPullDownRefresh()
     }
   },
   onPullDownRefresh() {
-    this.getGHSList().then(res => {
+    this.getGhsList().then(res => {
       uni.stopPullDownRefresh();
     })
   },
@@ -78,16 +88,17 @@ export default {
       let that = this
       changeDelStatus({delStatus:0,ghsId:ghs.id}).then(res=>{
         if(res.code == 1){
-          that.getGHSList()
+          that.resetList()
+          that.getGhsList()
         }
       })
     },
     init() {
-      this.getGHSList()
+      this.getGhsList()
     },
-    getGHSList () {
-      return ghsList({delStatus:1}).then(res => {
-        this.supplierList = res.data.list
+    getGhsList () {
+      return ghsList({delStatus:1,page: this.list.page}).then(res => {
+        this.completes(res)
       })
     },
     settleAccounts (item) {

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 {