diff --git a/apis/orderApi.js b/apis/orderApi.js
index 3e81ca6..00eb2dd 100644
--- a/apis/orderApi.js
+++ b/apis/orderApi.js
@@ -61,7 +61,7 @@ export const submitClientOrder = (data) => {
  */
 export const getClientOrderInfo = (data) => {
   return http.get({
-    url: '/base-paper-trading/get/customer/order/details',
+    url: '/base-paper-trading/get/customer/order/details1',
     data
   })
 }
@@ -159,3 +159,16 @@ export function getCooperationList(data) {
     data
   })
 }
+
+/**
+ * 提交微信直付单，返回微信支付参数
+ * @param {object} data
+ * @property {string} data.customerOrderId
+ * @property {string} data.wxAppid
+ */
+export function makeSupplierPay(data) {
+  return http.post({
+    url: '/base-paper-trading/submit/wx/straight/pay',
+    data
+  })
+}
diff --git a/components/qn-select/qn-select.vue b/components/qn-select/qn-select.vue
index 41b45bf..7fe659d 100644
--- a/components/qn-select/qn-select.vue
+++ b/components/qn-select/qn-select.vue
@@ -61,6 +61,9 @@ export default {
       label: ''
     }
   },
+  created() {
+    this.handleChange(this.value, this.options)
+  },
   methods: {
     handleSelect(item) {
       if (this.multiple) {
diff --git a/enums/index.js b/enums/index.js
index c4fbeb5..6dc646c 100644
--- a/enums/index.js
+++ b/enums/index.js
@@ -3,6 +3,8 @@ const urlEnv = env === 'production' ? '' : `-${env}`
 
 export const XAPPID = '503258978847966407'
 
+export const WX_APPID = 'wx6c66084e2de41575'
+
 export const H5_URL = `https://printpackage${urlEnv}.qniao.cn`
 
 /**
@@ -220,7 +222,7 @@ export const orderStatusMap = {
 }
 
 /**
- * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
+ * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,微信服务商支付/30215,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
  */
 export const supplierOrderStatusEnum = {
   WAIT_CLIENT_CONFIRM: 30202,
@@ -230,6 +232,7 @@ export const supplierOrderStatusEnum = {
   WAIT_CLIENT_LOAN: 30207,
   PAYING: 30208,
   WAIT_CLIENT_PAY: 30214,
+  WX_PAY_SUPPLIER: 30215,
   PAY_FAIL: 30211,
   FINISHED: 30213,
   WAIT_CLIENT_REPAY: 30217,
diff --git a/env/index.js b/env/index.js
index bcf6a22..a0bfcb1 100644
--- a/env/index.js
+++ b/env/index.js
@@ -1,8 +1,8 @@
 /**
  * @description 唯一环境变量
  */
-// const env = 'test'
+const env = 'test'
 // const env = 'dev'
-const env = 'production'
+// const env = 'production'
 
 export default env
diff --git a/manifest.json b/manifest.json
index c95377e..bb53463 100644
--- a/manifest.json
+++ b/manifest.json
@@ -24,7 +24,6 @@
         },
         /* 模块配置 */
         "modules" : {
-            "iBeacon" : {},
             "Share" : {},
             "Payment" : {},
             "Push" : {},
@@ -39,8 +38,6 @@
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
@@ -52,9 +49,7 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
diff --git a/pages.json b/pages.json
index d8f4d71..3d66110 100644
--- a/pages.json
+++ b/pages.json
@@ -175,7 +175,7 @@
       "path": "pages/order-detail/index",
       "style": {
         "navigationBarTitleText": "订单详情",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationStyle": "custom"
       }
     },
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index 72f9dd9..ab261f9 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -1,10 +1,7 @@
 <template>
   <view class="page">
-    <!-- 非工厂展示 -->
-    <view v-show="!isFactory">空白页</view>
-    <!-- 工厂企业展示 -->
-    <view v-show="isFactory">
-      <view class="flex-col group" v-if="deviceList.length > 0">
+    <view>
+      <view class="flex-col group" v-show="deviceList.length > 0">
         <view class="flex-col section_1">
           <view class="flex-row-center-center page__title">监控台</view>
           <view class="flex-col group_5">
@@ -110,7 +107,7 @@
           </scroll-list>
         </view>
       </view>
-      <view v-else>
+      <view v-show="deviceList.length == 0">
         <empty-data></empty-data>
       </view>
     </view>
@@ -152,9 +149,6 @@ export default {
     }
   },
   computed: {
-    isFactory() {
-      return this.$store.state.companyInfo.enterpriseType == enterpriseType.PRINT_PACKAGE_FACTORY
-    },
     userName() {
       return this.$store.state.userInfo.name || this.$store.state.userInfo.mobile
     },
@@ -163,7 +157,8 @@ export default {
     }
   },
   onShow() {
-    if (this.isFactory) {
+    let isFactory = this.$store.state.companyInfo.enterpriseType == enterpriseType.PRINT_PACKAGE_FACTORY
+    if (isFactory) {
       this.getDeviceList()
       this.getDeviceStatistics()
     }
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 52a8994..00f46a5 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -4,10 +4,7 @@
       <view class="flex-row section_2">
         <text class="text">原纸商城</text>
         <view class="flex-row items-center section_3">
-          <image
-            src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16488644996273525546.png"
-            class="image_1"
-          />
+          <image src="/static/imgs/mall/search-icon.png" class="image_1" />
           <qn-easyinput @confirm="downCallback" :maxlength="15" v-model="condition.searchValue" :inputBorder="false" placeholder="输入搜索信息"></qn-easyinput>
         </view>
       </view>
@@ -16,10 +13,7 @@
       <view class="flex-col list">
         <view class="list-item flex-col" :key="i" v-for="(item, i) in storeList">
           <view class="flex-row">
-            <image
-              src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/611dd17441a9be0011f45822/620ccb0962a7d90011fe5c8f/16488644996327336999.png"
-              class="image_2"
-            />
+            <image src="/static/imgs/mall/default-avatar.png" class="image_2" />
             <view class="right-group flex-col" @click="jumpStore(item)">
               <view class="text_2" v-html="item.enterpriseName"></view>
               <view class="bottom-group flex-row">
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 610312b..93a7567 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -28,6 +28,8 @@
           <view v-if="supplierOrder.status == supplierOrderStatusEnum.WAIT_CLIENT_PAY" class="button-item" @click="confirmWxPay(supplierOrder.mallSupplierId)">
             去付款
           </view>
+          <!-- 微信服务商支付待付款 -->
+          <view v-if="supplierOrder.status == supplierOrderStatusEnum.WX_PAY_SUPPLIER" class="button-item" @click="makeWxpay()">去付款</view>
           <!-- 待收货展示 -->
           <view v-else-if="supplierOrder.status == supplierOrderStatusEnum.WAIT_RECEIVE" class="button-item" @click="confirmReceive(supplierOrder)">
             确认收货
@@ -158,9 +160,17 @@
 
 <script>
 import { go2, back, uploadImage } from '@/utils/hook.js'
-import { getClientOrderInfo, clientUploadVoucher, clientDeleteVoucher, clientConfirmOrder, getReciptCode } from '@/apis/orderApi.js'
+import { getClientOrderInfo, clientUploadVoucher, clientDeleteVoucher, clientConfirmOrder, getReciptCode, makeSupplierPay } from '@/apis/orderApi.js'
 import { transformFileToImg, getFeisuanUrl } from '@/apis/commonApi.js'
-import { orderStatusEnum, supplierOrderStatusMap, supplierOrderStatusEnum, paymentMethodMap, paymentMethodEnum, invoiceStatusMap } from '@/enums/index.js'
+import {
+  orderStatusEnum,
+  supplierOrderStatusMap,
+  supplierOrderStatusEnum,
+  paymentMethodMap,
+  paymentMethodEnum,
+  invoiceStatusMap,
+  WX_APPID
+} from '@/enums/index.js'
 const statusImg = {
   [orderStatusEnum.WAIT_SUPPLIER_CONFIRM]: '待供应商确认',
   [orderStatusEnum.ORDERED]: '已下单',
@@ -187,6 +197,7 @@ const showUploadStatus = [
 export default {
   data() {
     return {
+      orderId: null,
       orderInfo: {
         deliveryAddress: {},
         supplierOrder: []
@@ -202,7 +213,7 @@ export default {
   },
   onLoad(option) {
     if (option.orderId) {
-      this.init(option.orderId)
+      this.orderId = option.orderId
     } else {
       uni.showToast({
         title: '订单信息错误',
@@ -215,6 +226,16 @@ export default {
       })
     }
   },
+  onPullDownRefresh() {
+    console.log('下拉刷新')
+    this.init(this.orderId)
+    uni.stopPullDownRefresh()
+  },
+  onShow() {
+    if (this.orderId) {
+      this.init(this.orderId)
+    }
+  },
   methods: {
     go2,
     back,
@@ -222,6 +243,7 @@ export default {
       getClientOrderInfo({
         customerOrderId: orderId
       }).then((res) => {
+        console.log('订单详情', res)
         if (res) {
           this.orderInfo = res
         }
@@ -368,6 +390,40 @@ export default {
         }
       })
     },
+    makeWxpay() {
+      makeSupplierPay({ customerOrderId: this.orderInfo.orderId, wxAppid: WX_APPID, apiType: 'app' }).then((info) => {
+        if (info) {
+          console.log('info', info)
+          uni.requestPayment({
+            provider: 'wxpay',
+            orderInfo: {
+              appid: info.appId,
+              partnerid: info.partnerid,
+              prepayid: info.prepayId,
+              package: 'Sign=WXPay',
+              noncestr: info.nonceStr,
+              timestamp: info.timeStamp,
+              sign: info.paySign
+            },
+            success: () => {
+              uni.showToast({
+                title: '支付成功',
+                icon: 'none',
+                duration: 1500
+              })
+            },
+            fail: (err) => {
+              console.log('err', err)
+              uni.showToast({
+                title: '支付失败',
+                icon: 'none',
+                duration: 1500
+              })
+            }
+          })
+        }
+      })
+    },
     clip(content) {
       uni.setClipboardData({
         data: content,
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index 793f879..2286bb5 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -293,7 +293,7 @@ export default {
               success: () => {
                 setTimeout(() => {
                   // #ifdef APP-PLUS
-                  go2('page-view', { title: '合同签署', url: encodeURIComponent(res.signUrl) })
+                  go2('page-view', { title: '合同签署', url: encodeURIComponent(res.signUrl) }, true)
                   // #endif
                   // #ifdef H5
                   if (window) {
diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue
index ddcde5d..f85b13d 100644
--- a/pages/page-view/index.vue
+++ b/pages/page-view/index.vue
@@ -33,14 +33,25 @@ export default {
       })
     }
   },
-  created() {
-    makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => {
-      this.destroySocket()
-      this.socket = res
-      this.socket.onMessage(this.getMessage)
-    })
+  onShow() {
+    this.initSocket()
+  },
+  onHide() {
+    console.log('onHide')
+    this.destroySocket()
+  },
+  onUnload() {
+    console.log('onUnload')
+    this.destroySocket()
   },
   methods: {
+    initSocket() {
+      makeSocket({ pageInfo: 'page-view', retry: true }).then((res) => {
+        this.destroySocket()
+        this.socket = res
+        this.socket.onMessage(this.getMessage)
+      })
+    },
     /**
      * @param {Object} data {data:{},type:''}
      */
@@ -68,12 +79,6 @@ export default {
         this.socket = null
       }
     }
-  },
-  destroyed() {
-    this.destroySocket()
   }
-  // onHide() {
-  //   this.destroySocket()
-  // }
 }
 </script>
diff --git a/static/imgs/mall/default-avatar.png b/static/imgs/mall/default-avatar.png
new file mode 100644
index 0000000..2fdab63
Binary files /dev/null and b/static/imgs/mall/default-avatar.png differ
diff --git a/static/imgs/mall/search-icon.png b/static/imgs/mall/search-icon.png
new file mode 100644
index 0000000..985590c
Binary files /dev/null and b/static/imgs/mall/search-icon.png differ