From bb4fec2ff8842160df29781f1f61995d6e0da8f7 Mon Sep 17 00:00:00 2001
From: buffeyu <yeqingyu@dimine.net>
Date: Wed, 19 Jan 2022 17:17:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/client-detail/basic-information.vue     | 4 ++--
 pages/client-detail/equipment-information.vue | 3 ++-
 pages/mall/index.vue                          | 2 +-
 pages/trade/index.vue                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue
index 8a62c02..8421927 100644
--- a/pages/client-detail/basic-information.vue
+++ b/pages/client-detail/basic-information.vue
@@ -14,7 +14,7 @@
 								<text class="text">{{info.name}}</text>
 								<image
 									class="icon"
-									:src="info.registrationStatus ? '/static/imgs/general/cooperation-icon.png' : '/static/imgs/general/no-cooperation-icon.png'"
+									:src="info.cooperation == 1 ? '/static/imgs/general/cooperation-icon.png' : '/static/imgs/general/no-cooperation-icon.png'"
 								></image>
 							</view>
 							<view class="desc u-line-2">
@@ -38,7 +38,7 @@
 					</view>
 					<view class="site">
 						<image class="icon" src="/static/imgs/client-detail/address-icon.png"></image>
-						<text class="text">{{ info.locProvinceName }}{{ info.locCityName }} {{ info.locDetail }}</text>
+						<text class="text">{{ info.locProvinceName }}{{ info.locCityName }}{{info.locDistrictName}}{{info.locStreetName}} {{ info.locDetail }}</text>
 					</view>
 				</view>
 			</view>
diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue
index 56b55e6..ddd4afb 100644
--- a/pages/client-detail/equipment-information.vue
+++ b/pages/client-detail/equipment-information.vue
@@ -131,7 +131,8 @@ export default {
         asc: '',
         desc: '',
         duration: '3',
-        enterpriseIds: []
+		customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效、
+		// customerEnterpriseId: '651107734133018624',
       },
       pagination: {
         pageNum: 0, // 初始会执行一次下拉加载
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index de1c005..c01fba0 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="warpper">
-		<uni-nav-bar>
+		<uni-nav-bar  :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
 			<view slot="left" class="left-title">纸商城</view>
 			<view slot="right" class="right-title" @tap="shareTap">分享</view>
 		</uni-nav-bar>
diff --git a/pages/trade/index.vue b/pages/trade/index.vue
index ac043a7..4ff25e0 100644
--- a/pages/trade/index.vue
+++ b/pages/trade/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="trade-index">
-		<uni-nav-bar>
+		<uni-nav-bar :fixed="true" color="#ffffff" background-color="#ffffff" :status-bar="true">
 			<view  class="left-title">
 				<view v-if="mainKey === '0'" class="text-view"><text class="title">交易大厅</text></view>
 				<view v-if="mainKey === '1'">

From 0e6602384eb7dfae1e4cbc0ceb619de540c6fe40 Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Wed, 19 Jan 2022 18:15:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/addUserApi.js                            |  11 ++
 apis/commonApi.js                             |  10 +
 apis/orderApi.js                              |  36 ++++
 .../packingStationItem.vue                    |   4 +-
 components/qn-map/qn-map.nvue                 |   2 +
 manifest.json                                 |   6 +-
 pages/add-user/index.vue                      |  61 +++++-
 pages/client-detail/index.vue                 | 150 ++++++++-------
 pages/order-detail/index.vue                  | 176 +++++++++++++++---
 pages/page-view/index.vue                     |   6 +
 static/icon/iconfont.css                      |   4 +
 static/icon/iconfont.ttf                      | Bin 1848 -> 1912 bytes
 static/imgs/order/camera.png                  | Bin 0 -> 1765 bytes
 utils/hook.js                                 |   4 +-
 utils/http/http.js                            |   3 +
 utils/http/index.js                           |   9 +-
 utils/index.js                                |  14 +-
 17 files changed, 384 insertions(+), 112 deletions(-)
 create mode 100644 static/imgs/order/camera.png

diff --git a/apis/addUserApi.js b/apis/addUserApi.js
index 810e657..9c880e8 100644
--- a/apis/addUserApi.js
+++ b/apis/addUserApi.js
@@ -23,3 +23,14 @@ export function addCustomer(data) {
     data
   })
 }
+/**
+ * 根据企业名称查询企业坐标列表
+ * @param {*} data
+ * @returns
+ */
+export function getCompanyLocationList(data) {
+  return http.get({
+    url: '/yyt-uec/get/enterprise/geographic/position/address',
+    data
+  })
+}
diff --git a/apis/commonApi.js b/apis/commonApi.js
index 59cee82..13a1fcb 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -76,3 +76,13 @@ export function getVerifyUrl(data = {}) {
 export function getGuaranteeContract(data = {}) {
   return http.post({ url: '/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=' + data.mallSupplierId, data })
 }
+/**
+ * 转换合同成图片
+ * @param {object} data 图片地址链接 fileUrl
+ */
+export function transformFileToImg(data) {
+  http.get({
+    url: '/document/get/enterprise-documents/file-image-base64',
+    data: data
+  })
+}
diff --git a/apis/orderApi.js b/apis/orderApi.js
index 7b37c81..1dbeb15 100644
--- a/apis/orderApi.js
+++ b/apis/orderApi.js
@@ -47,3 +47,39 @@ export function confirmSupplierOrder(data) {
     data
   })
 }
+
+/**
+ * 供应商操作纸品状态
+ * @param {object} data
+ * @returns {Promise<Object>}
+ */
+export function supplierOperatePaper(data) {
+  return http.post({
+    url: '/base-paper-trading/supplier/submit/outbound/delivery',
+    data
+  })
+}
+
+/**
+ * 供应商上传送货凭证
+ * @param {object} data
+ * @returns {Promise<Object>}
+ */
+export function supplierUploadVoucher(data) {
+  return http.post({
+    url: '/base-paper-trading/supplier/submit/upload/delivery/voucher',
+    data
+  })
+}
+
+/**
+ * 供应商确认送货
+ * @param {object} data supplierOrderId
+ * @returns {Promise<Object>}
+ */
+export function supplierDelivery(data) {
+  return http.post({
+    url: '/base-paper-trading/supplier/submit/confirm/delivery',
+    data
+  })
+}
diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue
index da5eeea..bf9e782 100644
--- a/components/bussiness-components/packingStationItem.vue
+++ b/components/bussiness-components/packingStationItem.vue
@@ -10,7 +10,7 @@
 				<view class="desc">
 					<text>{{ transformBusiness(info.business) }}</text>
 				</view>
-				<view v-show="info.whetherCooperation === 1" class="box-area">
+				<view v-if="info.whetherCooperation === 1" class="box-area">
 					<view class="box">
 						<view><text class="title">月采购量</text></view>
 						<view style="margin-top: 16rpx">
@@ -30,7 +30,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-show="info.whetherCooperation === 0" class="box-area">
+				<view v-if="info.whetherCooperation === 0" class="box-area">
 					<view class="box">
 						<view><text class="title">法定代表人</text></view>
 						<view style="margin-top: 16rpx">
diff --git a/components/qn-map/qn-map.nvue b/components/qn-map/qn-map.nvue
index e7262de..a2aa7d9 100644
--- a/components/qn-map/qn-map.nvue
+++ b/components/qn-map/qn-map.nvue
@@ -49,9 +49,11 @@ export default {
   watch: {
     // 只监听items一层变化
     items(val) {
+			console.log('val:',val)
       this.markers = val.map((item) => {
         return this.causeMarker(item)
       })
+			console.log('res:',this.markers)
       this.mapContext.addMarkers({
         markers: this.markers,
         clear: true,
diff --git a/manifest.json b/manifest.json
index 76c1e80..db3feb2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,18 +35,21 @@
             "android" : {
                 "permissions" : [
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<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.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<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\"/>"
@@ -77,7 +80,8 @@
                         "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325",
                         "appkey_android" : "877848546f7f3717101a17c33e1d4df3"
                     }
-                }
+                },
+                "share" : {}
             }
         },
         "uniStatistics" : {
diff --git a/pages/add-user/index.vue b/pages/add-user/index.vue
index 8a74842..f03f9e0 100644
--- a/pages/add-user/index.vue
+++ b/pages/add-user/index.vue
@@ -73,6 +73,9 @@
           ></qn-easyinput>
         </view>
       </view>
+      <qn-form-item label="点击定位" required v-if="!hasSelected">
+        <image @click="showLocationList" style="width: 32rpx; height: 32rpx" src="/static/imgs/order/location-icon.png"></image>
+      </qn-form-item>
       <view class="qn-form-item qn-form-item">
         <view class="label">
           <uni-icons custom-prefix="iconfont" type="icon-required" size="14" color="#F5222D"></uni-icons>
@@ -81,7 +84,7 @@
         <view class="value">
           <!-- <qn-easyinput v-model="form.shortName" :inputBorder="false" text="right" placeholder="选择所在区域"></qn-easyinput> -->
           <qn-data-picker
-            :readonly="hasSelected"
+            :readonly="true"
             text="right"
             :border="false"
             class="qn-picker"
@@ -106,12 +109,12 @@
         <view class="value">
           <qn-easyinput
             :maxlength="20"
-            :disabled="hasSelected"
+            :disabled="true"
             :styles="{ disableColor: '#fff' }"
             v-model="form.locDetail"
             :inputBorder="false"
             text="right"
-            placeholder="请输入详细地址"
+            placeholder="请定位详细地址"
           ></qn-easyinput>
         </view>
       </view>
@@ -243,6 +246,21 @@
         </scroll-view>
       </view>
     </uni-popup>
+    <uni-popup ref="locationPopup" type="bottom">
+      <view class="popup_modal">
+        <slot name="title">
+          <view class="popup_modal-title">可选择以下定位公司</view>
+        </slot>
+        <scroll-view scroll-y="true" class="popup_modal-scroll">
+          <view @click="selectLocation(item)" style="height: 100rpx" class="popup_modal-scroll-item" v-for="(item, index) in locationList" :key="index">
+            <view class="location-item">
+              <text class="title">{{ item.enterpriseName }}</text>
+              <text class="address">{{ `${item.provinceName}/${item.cityName}/${item.districtName}/${item.address}` }}</text>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
     <qn-footer fixed height="120rpx">
       <view class="button-area">
         <view class="button button__cancel" @click="back">
@@ -259,7 +277,7 @@
 <script>
 import { back, uploadImage } from '@/utils/hook.js'
 import { getArea } from '@/apis/commonApi.js'
-import { getCompanyList, getCompanyInfoById, addCustomer } from '@/apis/addUserApi.js'
+import { getCompanyList, getCompanyInfoById, addCustomer, getCompanyLocationList } from '@/apis/addUserApi.js'
 import qnEasyinput from '@/components/qn-easyinput/qn-easyinput.vue'
 import qnDataPicker from '@/components/qn-data-picker/qn-data-picker.vue'
 import qnDatetimePicker from '@/components/qn-datetime-picker/qn-datetime-picker.vue'
@@ -314,6 +332,7 @@ export default {
         registeredCapital: null,
         foundDate: null
       },
+      locationList: [],
       searchList: [],
       hasSelected: false,
       items: []
@@ -341,6 +360,38 @@ export default {
         })
       }
     },
+    showLocationList() {
+      if (!this.form.name || !this.form.name.trim()) {
+        uni.showToast({
+          title: '请先填写公司名称',
+          icon: 'none'
+        })
+        return
+      }
+      getCompanyLocationList({ enterpriseName: this.form.name }).then((res) => {
+        if (res) {
+          this.locationList = res
+          this.$refs.locationPopup.open('bottom')
+        } else {
+          uni.showToast({
+            title: '暂无定位公司',
+            icon: 'error'
+          })
+        }
+      })
+    },
+    selectLocation(location) {
+      this.form.locProvinceId = location.provinceCode
+      this.form.locCityId = location.cityCode
+      this.form.locDistrictId = location.districtCode
+      this.form.locProvinceName = location.provinceName
+      this.form.locCityName = location.cityName
+      this.form.locDistrictName = location.districtName
+      this.form.locDetail = location.address
+      this.form.regAddrLongitude = location.longitude
+      this.form.regAddrLatitude = location.latitude
+      this.$refs.locationPopup.close()
+    },
     selectCompany(enterpriseId) {
       this.$refs.popup.close()
       getCompanyInfoById({ enterpriseId }).then((res) => {
@@ -368,6 +419,8 @@ export default {
       this.form.locDetail = info.locDetail
       this.form.registeredCapital = info.registeredCapital
       this.form.foundDate = info.foundDate
+      this.form.regAddrLongitude = info.regAddrLongitude
+      this.form.regAddrLatitude = info.regAddrLatitude
     },
     onAreaChange(e) {
       if (e.detail.value && e.detail.value.length > 0) {
diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue
index cd4c837..18d9c24 100644
--- a/pages/client-detail/index.vue
+++ b/pages/client-detail/index.vue
@@ -1,23 +1,29 @@
 <template>
-	<view class="warpper">
-		<qnHeader class="header">
-			<!-- <view class="header"> -->
-			<view class="header-title">客户详情</view>
-			<view class="right-title">客户授信</view>
-			<!-- </view> -->
-		</qnHeader>
-		<view>
-			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text" activeColor="#007AFF" class="segmented"></uni-segmented-control>
-			
-				<view class="content">
-					<view v-show="current === 0"><basicInformation ref="basicInformationRef" :customerId="customerId"></basicInformation></view>
-					<view v-show="current === 1"><equipmentInformation></equipmentInformation></view>
-					<view v-show="current === 2"><basePaperDeals></basePaperDeals></view>
-					<view v-show="current === 3"><wastePaperTrading></wastePaperTrading></view>
-				</view>
-			
-		</view>
-	</view>
+  <view class="warpper">
+    <qnHeader class="header">
+      <!-- <view class="header"> -->
+      <view class="header-title">客户详情</view>
+      <view class="right-title" @click="go2('client-credit')">客户授信</view>
+      <!-- </view> -->
+    </qnHeader>
+    <view>
+      <uni-segmented-control
+        :current="current"
+        :values="items"
+        @clickItem="onClickItem"
+        styleType="text"
+        activeColor="#007AFF"
+        class="segmented"
+      ></uni-segmented-control>
+
+      <view class="content">
+        <view v-show="current === 0"><basicInformation ref="basicInformationRef" :customerId="customerId"></basicInformation></view>
+        <view v-show="current === 1"><equipmentInformation></equipmentInformation></view>
+        <view v-show="current === 2"><basePaperDeals></basePaperDeals></view>
+        <view v-show="current === 3"><wastePaperTrading></wastePaperTrading></view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
@@ -26,65 +32,65 @@ import basicInformation from './basic-information.vue'
 import equipmentInformation from './equipment-information.vue'
 import basePaperDeals from './base-paper-deals.vue'
 import wastePaperTrading from './waste-paper-trading.vue'
-
+import { go2 } from '@/utils/hook.js'
 export default {
-	components: {
-		qnHeader,
-		basicInformation,
-		equipmentInformation,
-		basePaperDeals,
-		wastePaperTrading
-	},
-	data() {
-		return {
-			current: 0,
-			items: ['基础信息', '设备信息', '原纸交易', '废纸交易'],
-			customerId: null,
-			
-		}
-	},
-	onLoad(option) {
-		this.customerId = option.id || '800890'
-		this.$nextTick(() => {
-			this.$refs.basicInformationRef.getBaseInfo()
-		})
-	},
-	methods: {
-		onClickItem(e) {
-			console.log('e', e)
-			this.current = e.currentIndex
-		},
-	}
+  components: {
+    qnHeader,
+    basicInformation,
+    equipmentInformation,
+    basePaperDeals,
+    wastePaperTrading
+  },
+  data() {
+    return {
+      current: 0,
+      items: ['基础信息', '设备信息', '原纸交易', '废纸交易'],
+      customerId: null
+    }
+  },
+  onLoad(option) {
+    this.customerId = option.id || '800890'
+    this.$nextTick(() => {
+      this.$refs.basicInformationRef.getBaseInfo()
+    })
+  },
+  methods: {
+    go2,
+    onClickItem(e) {
+      console.log('e', e)
+      this.current = e.currentIndex
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .warpper {
-	.header {
-		justify-content: space-between;
-	}
-	.header-title {
-		font-size: 36rpx;
-		color: #000000;
-		letter-spacing: 0;
-		text-align: center;
-		font-weight: 500;
-	}
+  .header {
+    justify-content: space-between;
+  }
+  .header-title {
+    font-size: 36rpx;
+    color: #000000;
+    letter-spacing: 0;
+    text-align: center;
+    font-weight: 500;
+  }
 
-	.right-title {
-		font-size: 28rpx;
-		color: #007aff;
-		text-align: center;
-		line-height: 40rpx;
-		font-weight: 500;
-	}
-	.segmented {
-		height: 88rpx;
-		border-bottom: 2rpx solid #ECECEC;
-		font-size: 28rpx;
-		color: #333333;
-		text-align: center;
-		font-weight: 400;
-	}
+  .right-title {
+    font-size: 28rpx;
+    color: #007aff;
+    text-align: center;
+    line-height: 40rpx;
+    font-weight: 500;
+  }
+  .segmented {
+    height: 88rpx;
+    border-bottom: 2rpx solid #ececec;
+    font-size: 28rpx;
+    color: #333333;
+    text-align: center;
+    font-weight: 400;
+  }
 }
 </style>
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 4899c6b..154b0bc 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -30,20 +30,22 @@
           <text style="font-size: 30rpx; font-weight: 600; line-height: 1.2">
             {{ `${order.brandName}${order.productName} | ${order.gramWeight}g | ${order.width}*${order.length} | ${order.pieceQuantity}张` }}
           </text>
-          <view v-if="steps[index].length > 0 && steps[index][0].desc == '未完成'" class="button-item" @click="operatePaper(index, 'cut')">分切</view>
-          <view
-            v-else-if="steps[index].length > 0 && steps[index][steps[index].length - 2].desc == '未完成'"
-            class="button-item"
-            @click="operatePaper(index, 'outbound')"
-          >
-            出库
-          </view>
-          <view
-            v-else-if="steps[index].length > 0 && steps[index][steps[index].length - 1].desc == '未完成'"
-            class="button-item"
-            @click="operatePaper(index, 'send')"
-          >
-            发货
+          <view v-if="orderInfo.status == supplierOrderStatusEnum.WAIT_DELIVERY">
+            <view v-if="steps[index].length > 0 && steps[index][0].desc == '未完成'" class="button-item" @click="operatePaper(index, 'cut')">分切</view>
+            <view
+              v-else-if="steps[index].length > 0 && steps[index][steps[index].length - 2].desc == '未完成'"
+              class="button-item"
+              @click="operatePaper(index, 'outbound', 1000)"
+            >
+              出库
+            </view>
+            <view
+              v-else-if="steps[index].length > 0 && steps[index][steps[index].length - 1].desc == '未完成'"
+              class="button-item"
+              @click="operatePaper(index, 'send')"
+            >
+              发货
+            </view>
           </view>
         </view>
         <view class="order-row flex-row-center-space">
@@ -66,7 +68,7 @@
         <uni-steps
           :options="steps[index]"
           active-color="#1890FF"
-          :active="order.outboundProcessList.length > 0 ? order.outboundProcessList.length : -1"
+          :active="order.outboundProcessList.length > 0 ? order.outboundProcessList.length - 1 : -1"
         ></uni-steps>
       </view>
     </view>
@@ -80,6 +82,10 @@
         </view>
       </view>
       <view class="imgs flex-row-start-start">
+        <view class="default-upload" @click="uploadVoucher()">
+          <image src="/static/imgs/order/camera.png" class="icon"></image>
+          <text style="font-size: 26rpx; color: #4c4a58">上传凭证</text>
+        </view>
         <image style="width: 120rpx; height: 120rpx; margin-right: 12rpx" src=""></image>
       </view>
     </view>
@@ -129,17 +135,25 @@
     <qn-footer fixed height="120rpx" v-if="orderInfo.status === supplierOrderStatusEnum.WAIT_DELIVERY">
       <view class="flex-row-center-space" style="padding: 0 32rpx">
         <view class="button button_cancel" style="width: 220rpx" @click="cancel">取消订单</view>
-        <view class="button button_contact">查看合同</view>
-        <view class="button button_confirm" style="width: 220rpx">确认发货</view>
+        <view class="button button_contact" @click="viewContract">查看合同</view>
+        <view class="button button_confirm" @click="delivery" style="width: 220rpx">确认发货</view>
       </view>
     </qn-footer>
   </view>
 </template>
 
 <script>
-import { go2, back } from '@/utils/hook.js'
-import { getSupplierOrderDetail, cancelSupplierOrder, confirmSupplierOrder } from '@/apis/orderApi.js'
+import { go2, back, uploadImage } from '@/utils/hook.js'
+import {
+  getSupplierOrderDetail,
+  cancelSupplierOrder,
+  confirmSupplierOrder,
+  supplierOperatePaper,
+  supplierUploadVoucher,
+  supplierDelivery
+} from '@/apis/orderApi.js'
 import { supplierOrderStatusMap, supplierOrderStatusEnum } from '@/enums/index.js'
+import { transformFileToImg } from '@/apis/commonApi.js'
 export default {
   data() {
     return {
@@ -319,14 +333,108 @@ export default {
           if (res.confirm) {
             confirmSupplierOrder({
               orderId: order.orderId
+            }).then((res) => {
+              if (res) {
+                if (res) {
+                  // #ifdef APP-PLUS
+                  go2('page-view', { title: '供应商订单签约', url: encodeURIComponent(res.signUrl), params: this.params })
+                  // #endif
+                  // #ifdef H5
+                  window ? (window.location.href = res.signUrl) : ''
+                  // #endif
+                }
+                // uni.showToast({
+                //   title: '确认订单成功',
+                //   icon: 'success',
+                //   success: () => {
+                //     setTimeout(() => {
+                //       this.init(order.orderId)
+                //     }, 1000)
+                //   }
+                // })
+              }
+            })
+          }
+        }
+      })
+    },
+    // cut: 分切 outbound: 出库  send: 发货
+    operatePaper(index, type, quantity) {
+      const map = {
+        cut: 30301,
+        outbound: 30302,
+        send: 30303
+      }
+      let target = this.orderInfo.orderItems[index]
+      supplierOperatePaper({
+        quantity: quantity || target.pieceQuantity,
+        supplierOderItemId: target.supplierOderItemId,
+        status: map[type]
+      }).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '操作成功',
+            icon: 'success',
+            success: () => {
+              setTimeout(() => {
+                this.init(this.orderInfo.orderId)
+              }, 1000)
+            }
+          })
+        }
+      })
+    },
+    // 上传送货凭证
+    uploadVoucher() {
+      uploadImage(['album'], 5)
+        .then((urls) => {
+          if (urls) {
+            let promiseList = []
+            urls.forEach((url) => {
+              promiseList.push(
+                supplierUploadVoucher({
+                  supplierOrderId: this.orderInfo.orderId,
+                  proofDeliveryUrl: url
+                })
+              )
+            })
+            Promise.all(promiseList).then(() => {
+              uni.showToast({
+                title: '上传成功',
+                icon: 'success',
+                success: () => {
+                  setTimeout(() => {
+                    this.init(this.orderInfo.orderId)
+                  }, 1000)
+                }
+              })
+            })
+          }
+        })
+        .catch((e) => {
+          uni.showToast({
+            title: '上传失败',
+            icon: 'fail'
+          })
+        })
+    },
+    // 确认送货
+    delivery() {
+      uni.showModal({
+        title: '提示',
+        content: '确定确认送货吗？',
+        success: (res) => {
+          if (res.confirm) {
+            supplierDelivery({
+              supplierOrderId: this.orderInfo.orderId
             }).then((res) => {
               if (res) {
                 uni.showToast({
-                  title: '确认订单成功',
+                  title: '确认送货成功',
                   icon: 'success',
                   success: () => {
                     setTimeout(() => {
-                      this.init(order.orderId)
+                      this.init(this.orderInfo.orderId)
                     }, 1000)
                   }
                 })
@@ -336,8 +444,15 @@ export default {
         }
       })
     },
-    // cut: 分切 outbound: 出库  send: 发货
-    operatePaper(index, type) {},
+    // 查看合同
+    viewContract() {
+      let url = this.orderInfo.contractUrl
+      if (url) {
+        transformFileToImg({ fileUrl: url }).then((res) => {
+          uni.previewImage({ urls: [res.imgUrl], current: res.imgUrl })
+        })
+      }
+    },
     clip(content) {
       uni.setClipboardData({
         data: content,
@@ -460,4 +575,19 @@ export default {
   color: #007aff;
   margin: 0 14rpx;
 }
+.default-upload {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 10rpx;
+  background-color: #dcdee0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  .icon {
+    width: 56rpx;
+    height: 56rpx;
+    margin-bottom: 8rpx;
+  }
+}
 </style>
diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue
index 53b1071..060614a 100644
--- a/pages/page-view/index.vue
+++ b/pages/page-view/index.vue
@@ -37,7 +37,13 @@ export default {
     })
   },
   methods: {
+    /**
+     * @param {Object} data {data:{},type:''}
+     */
     getMessage(data) {
+      if (data.type == 'zzgSupplierTCSignSuccess') {
+        go2('order-detail', { orderId: data.data.orderId }, true)
+      }
       // 签约成功
       if (data.type == 'signSuccess') {
         // go2('paper-mall-order-detail', { id: data.orderId }, true)
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 3d820a3..670320d 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-Less:before {
+  content: "\e734";
+}
+
 .icon-m_dow_arrow:before {
   content: "\e600";
 }
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index d5a95226069ce1ffc5f48d8aaa612ec5bd90a4dd..b220aa952386772a1a17d7f9d78a4b4893f77e87 100644
GIT binary patch
delta 442
zcmYjNF-w9`6utMo7mDGhOBjTu<<Jn(U_u}SE<r@KIM<h&-{6;m4n>0y2n~VSw-hua
zwFZI>5e~IA_6wv*m!PGfp|JBbs0-)4bM8C$zWd&t@oChi%d3irPl#wcWt)ZDqu?9#
z7jTiy9qd-_t9~MR4IQyEW_oHV{Rr<15VMeQbz}v+4MZ%vv=1|aU$OXe`IJeQG>`f-
zXpe2~7uZMZI3I@&?U{DQKXDar5~(L5kuBtlrC{^0O5|FAVWr-lSysfLz)td}yyc63
z&?p8*biB3m|GOe_3hgGLvj|<MoJnqqUetN!S?8St8`dC=ZX^e64!Z|lixkCB;2t*U
zQrGB3`+cH6rhB4BJKSJGcW7-2FDIjeBRo^vhtN}WjUjZt2am?@^#*=LPpfAn8RCZa
j@K|_JhQ1%Tkw_4=j%8i?6bqKDc!bnirdV{st^m^y!|PMO

delta 381
zcmYjNy-LGS7(Msi*aodpP^chisSW|V>QvN4a1z{{VnbV-p|Jrw)JX*?4i1fZ1Ye-i
z#i4_%i}VSCb-0tO&_SptEs7tUd%pAib4S**)yZES#(=m7P%8UwP`MerQICjrt$uly
zAGWiAx}!F|s#{sN^%HB~i5-uDbgXXa_lZr<Z?-aYSo_H*Q*V@A<iNbTrZ#=I6$lGQ
z%&$=A&RxH{xcXS^0!9arwV-j)Tpn)E0x2GV{jk5Wry%GOAFq1%bfNf#IfDTpo;eQx
zvjO=)Z9*ndTGFSYHPMyYiUz`tzQxjkGYJDHm<}$GxlcGSP+&ufEFd+sH68=MJQ<f_
pHW@2>j+_@;Hbr9Gr%4Ht;o6$w?+*Sz??r{mR6+_R3`C`L_6LQ2N%H^z

diff --git a/static/imgs/order/camera.png b/static/imgs/order/camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..850d6626f1d8614a39c1f695400fc0cec2fddaf2
GIT binary patch
literal 1765
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
Hu0mjf%u_i6

literal 0
HcmV?d00001

diff --git a/utils/hook.js b/utils/hook.js
index 34ceae8..e5b83b8 100644
--- a/utils/hook.js
+++ b/utils/hook.js
@@ -100,7 +100,7 @@ export function exit() {
 export function uploadImage(sourceType = ['album', 'camera'], count = 1) {
   return new Promise((resolve, reject) => {
     uni.chooseImage({
-      count: 1,
+      count: count,
       sizeType: ['original', 'compressed'],
       sourceType: sourceType,
       success: (res) => {
@@ -141,7 +141,7 @@ export function uploadFile(path, type = 'image') {
         let result = JSON.parse(res.data)
         if (result.data) {
           resolve(result.data)
-		  return result.data
+          return result.data
         } else {
           reject(result.message)
         }
diff --git a/utils/http/http.js b/utils/http/http.js
index f4b5f89..83f5f5c 100644
--- a/utils/http/http.js
+++ b/utils/http/http.js
@@ -53,6 +53,9 @@ export default class Http {
         method: conf.method,
         success: (res) => {
           let data = resInterceptor(res, opt)
+          if (env === 'test') {
+            console.log('报错的请求参数:', conf)
+          }
           // 服务器错误也会用then抛出，需要自己判断data==null
           resolve(data)
         },
diff --git a/utils/http/index.js b/utils/http/index.js
index 7f8199f..d426edc 100644
--- a/utils/http/index.js
+++ b/utils/http/index.js
@@ -8,7 +8,8 @@ const xappid = '503258978847966403'
 const prefixList = {
   '/yyt-uec': `https://api-client-yyt${urlEnv}.qniao.cn`,
   '/base-paper-trading': `https://api-client-yyt${urlEnv}.qniao.cn`,
-  '/uec': `https://api-client-uec${urlEnv}.qniao.cn`
+  '/uec': `https://api-client-uec${urlEnv}.qniao.cn`,
+  '/document': `https://api-ops-yyt${urlEnv}.qniao.cn`
 }
 
 const config = {
@@ -87,12 +88,18 @@ const resInterceptor = (response, options) => {
         title: res.message,
         icon: 'none'
       })
+      if (env === 'test') {
+        console.log('报错的返回信息:', response)
+      }
       return null
     }
   } else {
     uni.showToast({
       title: '服务器错误，请联系客服'
     })
+    if (env === 'test') {
+      console.log('服务器错误的返回信息:', response)
+    }
     // 后期可以加记录
     return null
   }
diff --git a/utils/index.js b/utils/index.js
index ad47f00..1ac58bb 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -50,16 +50,16 @@ export const makeSocket = async ({ pageInfo = '', retry = false }) => {
 
   async function createSocket() {
     let url = ''
-    // if (env == 'production') {
-    //   url = 'wss://api-client-yyt.qniao.cn/qn-websocket-service/wechatwebsock?token='
-    // } else if (env == 'test') {
-    //   url = 'wss://api-client-yyt-test.qniao.cn/qn-websocket-service/wechatwebsock?token='
-    // }
     if (env == 'production') {
-      url = 'wss://api-client-yyt.qniao.cn/trading-center/wechatwebsock?token='
+      url = 'wss://api-client-yyt.qniao.cn/qn-websocket-service/wechatwebsock?token='
     } else if (env == 'test') {
-      url = 'wss://api-client-yyt-test.qniao.cn/trading-center/wechatwebsock?token='
+      url = 'wss://api-client-yyt-test.qniao.cn/qn-websocket-service/wechatwebsock?token='
     }
+    // if (env == 'production') {
+    //   url = 'wss://api-client-yyt.qniao.cn/trading-center/wechatwebsock?token='
+    // } else if (env == 'test') {
+    //   url = 'wss://api-client-yyt-test.qniao.cn/trading-center/wechatwebsock?token='
+    // }
     const token = store.state.qnToken
     const socketTask = await uni.connectSocket({
       url: `${url}${token}`,