no message

src/packageMaterial/pages/newSale/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <view class="form-container">
       <view class="item">
@@ -75,10 +74,10 @@
 
     <template slot="footer">
       <view class="footer-btn-group">
-        <u-button
+        <!-- <u-button
           text="历史记录"
           @click="$navToPage({ url: `/packageMaterial/pages/newSale/orderList?type=${type}` })"
-        ></u-button>
+        ></u-button> -->
         <u-button type="primary" text="提交" @click="submitData"></u-button>
       </view>
     </template>
@@ -96,77 +95,69 @@
     >
     </zjDialogPicker>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/index`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
- // #ifdef H5
-import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
+import zjDialogPicker from '@/components/zj-dialog/zj-dialog-picker.vue'
 
- export default {
-   components: {
-   	zjDialogPicker
-   },
+export default {
+  components: {
+    zjDialogPicker
+  },
 
-   data() {
-     return {
-       hasOid: false,
-       wbId: null, // 维保工单
-       wbIsAllFee: null, // 维保工单是否包含全部费用
-       wbPayType: null, // 维保工单费用支付方式
-       type: 'M',
-       userMobile: '',
-       orderNo: '',
-       salesType: 'OUT',
-       brand: null,
-       brandList: [],
-       isShowBrandDialog: false,
-       category: null,
-       categoryList: [],
-       isShowCategoryDialog: false,
-       websit: null,
-       websitList: [],
-       isShowWebsitDialog: false,
-       rpMaterialOrderItemList:[]
-     }
-   },
+  data() {
+    return {
+      hasOid: false,
+      wbId: null, // 维保工单
+      wbIsAllFee: null, // 维保工单是否包含全部费用
+      wbPayType: null, // 维保工单费用支付方式
+      type: 'M',
+      userMobile: '',
+      orderNo: '',
+      salesType: 'OUT',
+      brand: null,
+      brandList: [],
+      isShowBrandDialog: false,
+      category: null,
+      categoryList: [],
+      isShowCategoryDialog: false,
+      websit: null,
+      websitList: [],
+      isShowWebsitDialog: false,
+      rpMaterialOrderItemList: []
+    }
+  },
 
-  onLoad({type, oid = ''}) {
-     this.type = type;
-     this.hasOid = oid.length > 0;
-     uni.setNavigationBarTitle({
-     　title: '配件收款'
-     })
+  onLoad({ type, oid = '' }) {
+    this.type = type
+    this.hasOid = oid.length > 0
+    uni.setNavigationBarTitle({
+      title: '配件收款'
+    })
     this.getWebsitList(() => {
-      if(this.hasOid) {
-        this.$api.post('/pg/order/base/detail', {
-          orderBaseId: oid,
-        }).then((res) => {
-          console.log(res.data)
-          const data = res.data;
-          this.orderNo = oid;
-          this.userMobile = data.userMobile;
-          this.websit = this.websitList.find(item => item.websitId == data.websitId) || {}
-          if(data.pgOrderProducts && data.pgOrderProducts.length > 0) {
-            this.brand = {
-              id: data.pgOrderProducts[0].brandId,
-              brandName: data.pgOrderProducts[0].brandName
+      if (this.hasOid) {
+        this.$api
+          .post('/pg/order/base/detail', {
+            orderBaseId: oid
+          })
+          .then(res => {
+            console.log(res.data)
+            const data = res.data
+            this.orderNo = oid
+            this.userMobile = data.userMobile
+            this.websit = this.websitList.find(item => item.websitId == data.websitId) || {}
+            if (data.pgOrderProducts && data.pgOrderProducts.length > 0) {
+              this.brand = {
+                id: data.pgOrderProducts[0].brandId,
+                brandName: data.pgOrderProducts[0].brandName
+              }
             }
-          }
-          this.wbId = data.rpProjectRepairId || '';
-          this.wbIsAllFee = data.isAllFee || '';
-          this.wbPayType = data.feePayMethod || '';
-        })
+            this.wbId = data.rpProjectRepairId || ''
+            this.wbIsAllFee = data.isAllFee || ''
+            this.wbPayType = data.feePayMethod || ''
+          })
       }
-    });
-
+    })
   },
 
   onShow() {
@@ -174,12 +165,12 @@ import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
     if (data.dijiIndex !== undefined && this.rpMaterialOrderItemList[Number(data.dijiIndex)]) {
       this.rpMaterialOrderItemList.splice(Number(data.dijiIndex), 1, {
         ...this.rpMaterialOrderItemList[Number(data.dijiIndex)],
-        "goodsAmount": data.goodsAmount,
-        "goodsCode": data.goodsCode,
-        "goodsId": data.goodsId,
-        "goodsName": data.goodsName,
-        "unit": data.goodsUnit,
-        "num": data.num,
+        goodsAmount: data.goodsAmount,
+        goodsCode: data.goodsCode,
+        goodsId: data.goodsId,
+        goodsName: data.goodsName,
+        unit: data.goodsUnit,
+        num: data.num
       })
     }
     this.$removeStorage('materialSaleData')
@@ -188,15 +179,15 @@ import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
   methods: {
     addpeijian() {
       this.rpMaterialOrderItemList.push({
-        "goodsAmount": "",
-        "goodsCode": "",
-        "goodsId": "",
-        "goodsName": "",
-        "unit": "",
-        "num": "",
-        "oldPartsName": "",
-        "oldPartsNumber": "",
-        "repairFlag": "",
+        goodsAmount: '',
+        goodsCode: '',
+        goodsId: '',
+        goodsName: '',
+        unit: '',
+        num: '',
+        oldPartsName: '',
+        oldPartsNumber: '',
+        repairFlag: ''
       })
     },
 
@@ -204,40 +195,45 @@ import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
       this.rpMaterialOrderItemList.splice(index, 1)
     },
 
-     getWebsitList(cb) {
-       this.$api.get('/user/apply/websit')
-       .then(res => {
-         this.websitList = res.data;
-         if (this.websitList.length == 1) {
+    getWebsitList(cb) {
+      this.$api.get('/user/apply/websit').then(res => {
+        this.websitList = res.data
+        if (this.websitList.length == 1) {
           this.websit = this.websitList[0]
-         }
-         cb?.()
-       })
-     },
+        }
+        cb?.()
+      })
+    },
 
     confirmWebsitDialog(e) {
-       this.websit = this.websitList[e[0]];
-       this.isShowWebsitDialog = false;
-     },
+      this.websit = this.websitList[e[0]]
+      this.isShowWebsitDialog = false
+    },
 
     toChooseProduct(index) {
-      if(!this.websit) return this.$toast('请选择所属网点');
+      if (!this.websit) return this.$toast('请选择所属网点')
       this.$navToPage({
-        url: `/packageMaterial/pages/newSale/product?dijiIndex=${index}&type=${this.type}&categoryId=${this.type=='P'?this?.category?.categoryId:''}&categoryName=${this.type=='P'?this?.category?.name:''}&userMobile=${this.userMobile}&orderNo=${this.orderNo}&partsWebsitId=${this.websit.partsWebsitId}&websitId=${this.websit.websitId}&websitName=${this.websit.name}&wbId=${this.wbId||''}&wbIsAllFee=${this.wbIsAllFee||''}&wbPayType=${this.wbPayType||''}`
+        url: `/packageMaterial/pages/newSale/product?dijiIndex=${index}&type=${this.type}&categoryId=${
+          this.type == 'P' ? this?.category?.categoryId : ''
+        }&categoryName=${this.type == 'P' ? this?.category?.name : ''}&userMobile=${this.userMobile}&orderNo=${
+          this.orderNo
+        }&partsWebsitId=${this.websit.partsWebsitId}&websitId=${this.websit.websitId}&websitName=${
+          this.websit.name
+        }&wbId=${this.wbId || ''}&wbIsAllFee=${this.wbIsAllFee || ''}&wbPayType=${this.wbPayType || ''}`
       })
     },
 
     submitData() {
-      if(!this.userMobile) return this.$toast('请输入客户电话');
-      if (this.rpMaterialOrderItemList.length < 1) return this.$toast('请选择');
+      if (!this.userMobile) return this.$toast('请输入客户电话')
+      if (this.rpMaterialOrderItemList.length < 1) return this.$toast('请选择')
       for (var item of this.rpMaterialOrderItemList) {
-        if(!item.repairFlag) return this.$toast('维修标识不能为空');
-        if(!item.oldPartsNumber) return this.$toast('旧配件编号不能为空');
-        if(!item.oldPartsName) return this.$toast('旧配件名称不能为空');
-        if(!item.goodsName) return this.$toast('新配件名称不能为空');
-        if(!item.goodsCode) return this.$toast('新配件编号不能为空');
+        if (!item.repairFlag) return this.$toast('维修标识不能为空')
+        if (!item.oldPartsNumber) return this.$toast('旧配件编号不能为空')
+        if (!item.oldPartsName) return this.$toast('旧配件名称不能为空')
+        if (!item.goodsName) return this.$toast('新配件名称不能为空')
+        if (!item.goodsCode) return this.$toast('新配件编号不能为空')
       }
-      if(!this.orderNo) return this.$toast('请填写工单号');
+      if (!this.orderNo) return this.$toast('请填写工单号')
       this.$setStorage('materialSaleDataZhiFu', {
         type: this.type,
         categoryId: this.type == 'P' ? this?.category?.categoryId : '',
@@ -253,27 +249,13 @@ import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
         wbIsAllFee: this.wbIsAllFee,
         wbPayType: this.wbPayType,
         goodsList: this.rpMaterialOrderItemList
-      });
+      })
       this.$navToPage({
         url: `/packageMaterial/pages/newSale/order`
       })
-    },
-  },
+    }
+  }
 }
-
- // #endif
- // #ifndef H5
- export default {
-   data() {
-     return {
-       pam: {},
-     }
-   },
-   onLoad(pam) {
-     this.pam = pam;
-   }
- }
- // #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/newSale/order.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <view class="all-container">
       <view class="common-title">产品信息</view>
@@ -61,119 +60,103 @@
       </view>
     </template>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/order`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   data() {
     return {
       type: 'M',
       userMobile: '',
       orderNo: '',
-      salesType: "",
-      brandId: "",
-      brandName: "",
-      categoryId: "",
-      categoryName: "",
-      websitId: "",
-      websitName: "",
+      salesType: '',
+      brandId: '',
+      brandName: '',
+      categoryId: '',
+      categoryName: '',
+      websitId: '',
+      websitName: '',
       wbId: null, // 维保工单
       wbIsAllFee: null, // 维保工单是否包含全部费用
       wbPayType: null, // 维保工单费用支付方式
       goodsList: [],
       remark: '',
-      otherPrice: "",
-      servicePrice: ""
+      otherPrice: '',
+      servicePrice: ''
     }
   },
 
   computed: {
     totalNum() {
-      let val = 0;
+      let val = 0
       this.goodsList.forEach(item => {
-        val = val + item.num;
+        val = val + item.num
       })
       return val
     },
     totalPrice() {
-      let val = 0;
-      this.goodsList.filter(item=>item.repairFlag=='OUTSIDE').forEach(item => {
-        val = val + (item.num * (item.goodsAmount * 100) / 100);
-      })
-      return  val;
-    },
+      let val = 0
+      this.goodsList
+        .filter(item => item.repairFlag == 'OUTSIDE')
+        .forEach(item => {
+          val = val + (item.num * (item.goodsAmount * 100)) / 100
+        })
+      return val
+    }
   },
 
   onLoad() {
-    let data = this.$getStorage('materialSaleDataZhiFu');
-    if(data) {
-      this.type = data.type;
-      this.userMobile = data.userMobile;
-      this.orderNo = data.orderNo;
-      this.categoryId = data.categoryId;
-      this.categoryName = data.categoryName;
-      this.websitId = data.websitId;
-      this.websitName = data.websitName;
-      this.wbId = data.wbId;
-      this.wbIsAllFee = data.wbIsAllFee;
-      this.wbPayType = data.wbPayType;
-      this.goodsList = data.goodsList;
+    let data = this.$getStorage('materialSaleDataZhiFu')
+    if (data) {
+      this.type = data.type
+      this.userMobile = data.userMobile
+      this.orderNo = data.orderNo
+      this.categoryId = data.categoryId
+      this.categoryName = data.categoryName
+      this.websitId = data.websitId
+      this.websitName = data.websitName
+      this.wbId = data.wbId
+      this.wbIsAllFee = data.wbIsAllFee
+      this.wbPayType = data.wbPayType
+      this.goodsList = data.goodsList
     }
   },
 
   onHide: function () {
-    this.$removeStorage('materialSaleData');
+    this.$removeStorage('materialSaleData')
   },
 
   methods: {
     submitData(type) {
-      if ((Number(this.otherPrice)+0)!==Number(this.otherPrice)) return this.$toast(`其他费用需要为数字`)
-      if ((Number(this.servicePrice)+0)!==Number(this.servicePrice)) return this.$toast(`服务费用需要为数字`)
-
-      this.$api.postJson('/pay/buy', {
-        settlementType: this.salesType,
-        goodsType: this.type,
-        remark: this.remark,
-        userMobile: this.userMobile,
-        workerOrderId: this.orderNo,
-        categoryId: this.categoryId || '123',
-        categoryName: this.categoryName || '123',
-        websitId: this.websitId,
-        websitName: this.websitName,
-        workerOrderItems: this.goodsList,
-        otherPrice: this.otherPrice,
-        servicePrice: this.servicePrice,
-      }).then(res => {
-        this.$navToPage({
-          url: `/packageMaterial/pages/newSale/pay?handleOrderId=${res.data}&wbId=${this.wbId}`
-        }, "redirectTo")
-      })
-    },
-  },
-}
+      if (Number(this.otherPrice) + 0 !== Number(this.otherPrice)) return this.$toast(`其他费用需要为数字`)
+      if (Number(this.servicePrice) + 0 !== Number(this.servicePrice)) return this.$toast(`服务费用需要为数字`)
 
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+      this.$api
+        .postJson('/pay/buy', {
+          settlementType: this.salesType,
+          goodsType: this.type,
+          remark: this.remark,
+          userMobile: this.userMobile,
+          workerOrderId: this.orderNo,
+          categoryId: this.categoryId || '123',
+          categoryName: this.categoryName || '123',
+          websitId: this.websitId,
+          websitName: this.websitName,
+          workerOrderItems: this.goodsList,
+          otherPrice: this.otherPrice,
+          servicePrice: this.servicePrice
+        })
+        .then(res => {
+          this.$navToPage(
+            {
+              url: `/packageMaterial/pages/newSale/pay?handleOrderId=${res.data}`
+            },
+            'redirectTo'
+          )
+        })
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/newSale/orderDetail.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <view class="all-container">
     <view class="bg"></view>
     <Loading :type="3" :loadStatus="loadStatus" :showText="errorText" />
@@ -80,41 +79,32 @@
       </template>
     </zj-page-layout>
   </view>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/orderDetail`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     statusFilter(val) {
       const MAP = {
         WAIT: '待支付',
         PAID: '已支付',
-        CANCEL: '已取消',
+        CANCEL: '已取消'
       }
-      return MAP[val];
+      return MAP[val]
     },
     salesTypeFilter(val) {
       const MAP = {
         OWN: '自有出库',
-        OUT: '外购销售',
+        OUT: '外购销售'
       }
-      return MAP[val];
+      return MAP[val]
     },
     payTypeFilter(val) {
       const MAP = {
         WECHAT: '微信支付',
-        LINE: '线下支付',
+        LINE: '线下支付'
       }
-      return MAP[val];
+      return MAP[val]
     }
   },
 
@@ -123,66 +113,60 @@ export default {
       id: null,
       refresherTriggered: false,
       loadStatus: 0,
-		errorText: '',
-      detail: null,
+      errorText: '',
+      detail: null
     }
   },
 
-  onLoad({id}) {
-    this.id = id;
-    this.getDetail();
+  onLoad({ id }) {
+    this.id = id
+    this.getDetail()
   },
 
   methods: {
     getDetail() {
-      this.$api.post('/pay/getOrder', {
-        orderId: this.id
-      }).then(res => {
-        this.detail = res.data;
-        this.loadStatus = 0;
-      }).catch(res => {
-    		this.errorText = res.message;
-    		this.loadStatus = 2;
-    	}).finally(res => {
-    		this.refresherTriggered = false;
-    	})
+      this.$api
+        .post('/pay/getOrder', {
+          orderId: this.id
+        })
+        .then(res => {
+          this.detail = res.data
+          this.loadStatus = 0
+        })
+        .catch(res => {
+          this.errorText = res.message
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     // 下拉刷新
     refresherrefresh() {
-      this.refresherTriggered = true;
-      this.getDetail();
+      this.refresherTriggered = true
+      this.getDetail()
     },
 
     // 取消订单
     cancelOrder() {
       this.$modal({
         content: '确认取消订单吗？'
-      }).then(() => {
-        this.$api.post('/pay/cancel', {
-          orderId: this.id
-        }).then(res => {
-          this.$successToast();
-          this.getDetail();
+      })
+        .then(() => {
+          this.$api
+            .post('/pay/cancel', {
+              orderId: this.id
+            })
+            .then(res => {
+              this.$successToast()
+              this.getDetail()
+            })
         })
-      }).catch(() => {})
+        .catch(() => {})
     }
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
-    }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/newSale/orderList.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout
     :isScroll="true"
+    :hasFooter="true"
     :refresherTriggered="refresherTriggered"
     @refresherrefresh="refresherrefresh"
     @scrolltolower="scrolltolower"
@@ -48,7 +48,7 @@
     </template>
 
     <view class="list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
+      <view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
         <view class="row top">
           <view class="label">制单时间</view>
           <view class="value">{{ item.createTime }}</view>
@@ -82,6 +82,17 @@
         </view>
         <view class="btns" v-if="item.payStatus == 'WAIT'" @tap.stop>
           <u-button text="取消订单" @click="cancelOrder(item)"></u-button>
+          <u-button
+            text="去收款"
+            type="primary"
+            @click="
+              () => {
+                $navToPage({
+                  url: `/packageMaterial/pages/newSale/pay?handleOrderId=${item.id}`
+                })
+              }
+            "
+          ></u-button>
         </view>
       </view>
     </view>
@@ -97,198 +108,196 @@
       @close="isShowDatePicker = false"
       @confirm="confirmDate"
     ></u-datetime-picker>
-  </zj-page-layout>
-  <!-- #endif -->
 
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/orderList`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
+    <template slot="footer">
+      <view class="bottom-container" style="box-sizing: border-box; padding: 20rpx">
+        <u-button
+          text="创建配件收款"
+          type="primary"
+          @click="
+            () => {
+              $navToPage({
+                url: `/packageMaterial/pages/newSale/index?type=P`
+              })
+            }
+          "
+        >
+        </u-button>
+      </view>
+    </template>
+  </zj-page-layout>
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     statusFilter(val) {
       const MAP = {
         WAIT: '待支付',
         PAID: '已支付',
-        CANCEL: '已取消',
+        CANCEL: '已取消'
       }
-      return MAP[val];
+      return MAP[val]
     },
     salesTypeFilter(val) {
       const MAP = {
         OWN: '自有出库',
-        OUT: '外购销售',
+        OUT: '外购销售'
       }
-      return MAP[val];
-    },
+      return MAP[val]
+    }
   },
 
   data() {
     return {
       type: 'M',
-		dataList: [],
-		pageNum: 1,
-		loadStatus: 0,
+      dataList: [],
+      pageNum: 1,
+      loadStatus: 0,
       refresherTriggered: false,
       tabList: [
-        {name: '全部', value: '', badge: {value: 0}},
-        {name: '待支付', value: 'WAIT', badge: {value: 0}},
-        {name: '已支付', value: 'PAID', badge: {value: 0}},
-        {name: '已取消', value: 'CANCEL', badge: {value: 0}},
+        { name: '全部', value: '', badge: { value: 0 } },
+        { name: '待支付', value: 'WAIT', badge: { value: 0 } },
+        { name: '已支付', value: 'PAID', badge: { value: 0 } },
+        { name: '已取消', value: 'CANCEL', badge: { value: 0 } }
       ],
       tabCurrent: 0,
       status: '',
       salesTypeList: [
-        {name: '全部', value: ''},
-        {name: '自有仓库', value: 'OWN'},
-        {name: '外购销售', value: 'OUT'},
+        { name: '全部', value: '' },
+        { name: '自有仓库', value: 'OWN' },
+        { name: '外购销售', value: 'OUT' }
       ],
       salesTypeCurrent: 0,
       salesType: '',
       isShowDatePicker: false,
       datePickerValue: Number(new Date()),
-      date: '',
+      date: ''
     }
   },
 
-  onLoad({type}) {
-    this.type = type;
-    this.getCount();
-    this.getList();
+  onLoad({ type }) {
+    this.type = type
+    this.getCount()
+    this.getList()
   },
 
   methods: {
     getCount() {
-    	this.$api.post('/pay/orderCount', {
-        goodsType: this.type,
-      }).then(res => {
-        if(!res.data) return false;
-    		// this.tabList[0].badge.value = res.data.qb || 0;
-    		this.tabList[1].badge.value = res.data.dzf || 0;
-    		// this.tabList[2].badge.value = res.data.yzf || 0;
-    		this.tabList[3].badge.value = res.data.yqx || 0;
-    	})
+      this.$api
+        .post('/pay/orderCount', {
+          goodsType: this.type
+        })
+        .then(res => {
+          if (!res.data) return false
+          // this.tabList[0].badge.value = res.data.qb || 0;
+          this.tabList[1].badge.value = res.data.dzf || 0
+          // this.tabList[2].badge.value = res.data.yzf || 0;
+          this.tabList[3].badge.value = res.data.yqx || 0
+        })
     },
 
     getList() {
-    	this.loadStatus = 1;
-    	this.$api.post('/pay/orderPage', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        payStatus: this.status,
-        yearMonth: this.date,
-        goodsType: this.type,
-        settlementType: this.salesType
-    	}).then(res => {
-    		this.loadStatus = 0;
-    		let list = res.data.records;
-    		if (list.length < 10) {
-    		  this.loadStatus = 2;
-    		}
-    		this.dataList = this.dataList.concat(list);
-    	}).catch(() => {
-    		this.loadStatus = 2;
-    	}).finally(res => {
-    		this.refresherTriggered = false;
-    	})
+      this.loadStatus = 1
+      this.$api
+        .post('/pay/orderPage', {
+          pageNum: this.pageNum,
+          pageSize: 10,
+          payStatus: this.status,
+          yearMonth: this.date,
+          goodsType: this.type,
+          settlementType: this.salesType
+        })
+        .then(res => {
+          this.loadStatus = 0
+          let list = res.data.records
+          if (list.length < 10) {
+            this.loadStatus = 2
+          }
+          this.dataList = this.dataList.concat(list)
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     changeTab(e) {
-    	this.tabCurrent = e.index;
-    	this.status = e.value;
-      this.refreshList();
+      this.tabCurrent = e.index
+      this.status = e.value
+      this.refreshList()
     },
 
     changeSalesType(e) {
-      this.salesTypeCurrent = e.index;
-      this.salesType = e.value;
-      this.refreshList();
+      this.salesTypeCurrent = e.index
+      this.salesType = e.value
+      this.refreshList()
     },
 
     resetDate() {
-      this.isShowDatePicker = false;
-      this.date = '';
-      this.refreshList();
+      this.isShowDatePicker = false
+      this.date = ''
+      this.refreshList()
     },
 
     confirmDate(e) {
-      this.isShowDatePicker = false;
+      this.isShowDatePicker = false
       let time = new Date(e.value)
-      let y = time.getFullYear();
-      let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
-      this.date = `${y}-${m}`;
-      this.refreshList();
+      let y = time.getFullYear()
+      let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
+      this.date = `${y}-${m}`
+      this.refreshList()
     },
 
     refreshList() {
-    	this.dataList = [];
-    	this.pageNum = 1;
-    	this.getList();
+      this.dataList = []
+      this.pageNum = 1
+      this.getList()
     },
 
     // 滚动到底部
     scrolltolower(e) {
-    	if (this.loadStatus === 0) {
-    		this.pageNum++;
-    		this.getList();
-    	}
+      if (this.loadStatus === 0) {
+        this.pageNum++
+        this.getList()
+      }
     },
 
     // 触发下拉刷新
     refresherrefresh(e) {
-    	this.refresherTriggered = true;
-      this.getCount();
-    	this.refreshList();
+      this.refresherTriggered = true
+      this.getCount()
+      this.refreshList()
     },
 
     toDetail(item) {
-      if (item.goodsType == 'M') {
-        this.$navToPage({
-          url: `/packageMaterial/pages/sale/orderDetail?id=${item.orderId}`
-        })
-      } else if (item.goodsType == 'P') {
-        this.$navToPage({
-          url: `/packageMaterial/pages/newSale/orderDetail?id=${item.orderId}`
-        })
-      }
+      this.$navToPage({
+        url: `/packageMaterial/pages/newSale/orderDetail?id=${item.orderId}`
+      })
     },
 
     // 取消订单
     cancelOrder(item) {
       this.$modal({
         content: '确认取消订单吗？'
-      }).then(() => {
-        this.$api.post('/pay/cancel', {
-          orderId: item.orderId
-        }).then(res => {
-          this.$successToast();
-          this.getCount();
-          this.refreshList();
+      })
+        .then(() => {
+          this.$api
+            .post('/pay/cancel', {
+              orderId: item.orderId
+            })
+            .then(res => {
+              this.$successToast()
+              this.getCount()
+              this.refreshList()
+            })
         })
-      }).catch(() => {})
-    },
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+        .catch(() => {})
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/newSale/pay.vue

@@ -12,11 +12,7 @@
           </view>
           <view class="id"><text>订单号：</text>{{ detail.orderId }}</view>
           <view class="product">
-            <view
-              class="it"
-              v-for="(item, index) in wbId ? detail.rpMaterialOrderItems : detail.workerOrderItems"
-              :key="index"
-            >
+            <view class="it" v-for="(item, index) in detail.workerOrderItems" :key="index">
               <view class="name"
                 >{{ item.goodsName }}<text>×{{ item.num }}{{ item.unit }}</text></view
               >
@@ -58,7 +54,6 @@ export default {
   data() {
     return {
       orderId: null,
-      wbId: null,
       refresherTriggered: false,
       loadStatus: 0,
       errorText: '',
@@ -73,9 +68,8 @@ export default {
   components: {
     zhifutanchuan
   },
-  onLoad({ handleOrderId, wbId }) {
+  onLoad({ handleOrderId }) {
     this.orderId = handleOrderId
-    this.wbId = wbId
     this.getDetail()
     this.crossPage.$on('reScanCode', () => {
       this.scanCode()

src/packageMaterial/pages/newSale/product.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <template slot="header">
       <view class="search-container">
@@ -50,18 +49,9 @@
       </view>
     </template>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/product`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 import { getStorage } from '@/common/utils/storage.js'
 export default {
   data() {
@@ -82,29 +72,45 @@ export default {
       rightList: [],
       loadStatus: 0,
       cartList: [],
-      selectId: "",
+      selectId: '',
       dijiIndex: 0,
-      partsWebsitId:"",
+      partsWebsitId: ''
     }
   },
 
-  onLoad({partsWebsitId, dijiIndex, type, userMobile, orderNo, salesType, brandId, brandName, categoryId, categoryName, websitId, websitName, wbId, wbIsAllFee, wbPayType}) {
-    this.dijiIndex = dijiIndex;
-    this.type = type;
-    this.userMobile = userMobile;
-    this.orderNo = orderNo;
-    this.categoryId = categoryId;
-    this.categoryName = categoryName;
-    this.partsWebsitId = partsWebsitId;
-    this.websitId = websitId;
-    this.websitName = websitName;
-    this.wbId = wbId;
-    this.wbIsAllFee = wbIsAllFee;
-    this.wbPayType = wbPayType;
+  onLoad({
+    partsWebsitId,
+    dijiIndex,
+    type,
+    userMobile,
+    orderNo,
+    salesType,
+    brandId,
+    brandName,
+    categoryId,
+    categoryName,
+    websitId,
+    websitName,
+    wbId,
+    wbIsAllFee,
+    wbPayType
+  }) {
+    this.dijiIndex = dijiIndex
+    this.type = type
+    this.userMobile = userMobile
+    this.orderNo = orderNo
+    this.categoryId = categoryId
+    this.categoryName = categoryName
+    this.partsWebsitId = partsWebsitId
+    this.websitId = websitId
+    this.websitName = websitName
+    this.wbId = wbId
+    this.wbIsAllFee = wbIsAllFee
+    this.wbPayType = wbPayType
     uni.setNavigationBarTitle({
-    　title: '选择配件'
+      title: '选择配件'
     })
-    this.getRightList();
+    this.getRightList()
   },
 
   computed: {
@@ -119,93 +125,87 @@ export default {
   methods: {
     // 获取右侧产品
     getRightList() {
-    	this.loadStatus = 1;
-      let url = '', params = {};
-      url = '/app/parts/stock/exist/worker/stock/list';
+      this.loadStatus = 1
+      let url = '',
+        params = {}
+      url = '/app/parts/stock/exist/worker/stock/list'
       params = {
-        partsAttr: "NEW",
+        partsAttr: 'NEW',
         identity: this.userInfo.idCard,
         partsWebsitId: this.partsWebsitId,
-        websitId: this.websitId,
+        websitId: this.websitId
       }
 
-    	this.$api.post(url, {
-        pageNum: 1,
-        pageSize: -1,
-        partsName: this.keyword,
-        ...params
-    	}).then(res => {
-        this.loadStatus = 0;
-        console.log(res.data)
-        let list = res.data.map(item => {
-          return this.type === 'M' ? {
-            goodsId: item.normId,
-            goodsName: item.normName,
-            goodsCode: item.normCode,
-            goodsUnit: item.unit,
-            goodsAmount: item.normAmount,
-            num: 0,
-            qty:item.qty,
-          } : {
-            goodsId: item.goodsId,
-            goodsName: item.goodsName,
-            goodsCode: item.goodsId,
-            goodsUnit: item.goodsStockUnit,
-            goodsAmount: item.marketPrice,
-            normType: "M",
-            num: 1,
-            qty:item.qty,
-          }
-        });
-        for(let i = 0; i < list.length; i++) {
-          for(let j = 0; j < this.cartList.length; j++) {
-            if(list[i].goodsId == this.cartList[j].goodsId) {
-              list[i].num = this.cartList[j].num;
+      this.$api
+        .post(url, {
+          pageNum: 1,
+          pageSize: -1,
+          partsName: this.keyword,
+          ...params
+        })
+        .then(res => {
+          this.loadStatus = 0
+          console.log(res.data)
+          let list = res.data.map(item => {
+            return this.type === 'M'
+              ? {
+                  goodsId: item.normId,
+                  goodsName: item.normName,
+                  goodsCode: item.normCode,
+                  goodsUnit: item.unit,
+                  goodsAmount: item.normAmount,
+                  num: 0,
+                  qty: item.qty
+                }
+              : {
+                  goodsId: item.goodsId,
+                  goodsName: item.goodsName,
+                  goodsCode: item.goodsId,
+                  goodsUnit: item.goodsStockUnit,
+                  goodsAmount: item.marketPrice,
+                  normType: 'M',
+                  num: 1,
+                  qty: item.qty
+                }
+          })
+          for (let i = 0; i < list.length; i++) {
+            for (let j = 0; j < this.cartList.length; j++) {
+              if (list[i].goodsId == this.cartList[j].goodsId) {
+                list[i].num = this.cartList[j].num
+              }
             }
           }
-        }
-    		if(list.length < 1){
-    			this.loadStatus = 2;
-    		}
-        this.rightList = list;
-    	}).catch(() => {
-    		this.loadStatus = 2;
-    	})
+          if (list.length < 1) {
+            this.loadStatus = 2
+          }
+          this.rightList = list
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
     },
 
     // 搜索
     searchData() {
-      this.getRightList();
+      this.getRightList()
     },
 
     submitData() {
       var data = this.rightList.find(item => item.goodsCode == this.selectId)
       if (data) {
-        this.$setStorage('materialSaleData', {...data, dijiIndex: this.dijiIndex});
-        this.$navToPage({
-          delta: 1
-        },"navigateBack")
+        this.$setStorage('materialSaleData', { ...data, dijiIndex: this.dijiIndex })
+        this.$navToPage(
+          {
+            delta: 1
+          },
+          'navigateBack'
+        )
       } else {
-        this.$toast('请选择');
+        this.$toast('请选择')
       }
-    },
-
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/newSale/result.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <view>
     <Loading :type="3" :loadStatus="loadStatus" :showText="errorText" />
 
@@ -51,26 +50,17 @@
       </template>
     </zj-page-layout>
   </view>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/newSale/result`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     payTypeFilter(val) {
       const MAP = {
         WECHAT: '微信支付',
-        LINE: '线下支付',
+        LINE: '线下支付'
       }
-      return MAP[val];
+      return MAP[val]
     }
   },
 
@@ -83,64 +73,62 @@ export default {
       errorText: '',
       detail: null,
       result: 0
-    };
+    }
   },
 
   onLoad({ handleOrderId, result, wbId }) {
-    this.orderId = handleOrderId;
-    this.result = Number(result);
-    this.wbId = wbId;
-    this.getDetail();
+    this.orderId = handleOrderId
+    this.result = Number(result)
+    this.wbId = wbId
+    this.getDetail()
   },
 
   methods: {
     getDetail() {
-      let url = '', params = {};
-      if(this.wbId) {
-        url = '/engin/material/detail';
-        params.id = this.orderId;
-      }else {
-        url = '/pay/getOrder';
-        params.orderId = this.orderId;
+      let url = '',
+        params = {}
+      if (this.wbId) {
+        url = '/engin/material/detail'
+        params.id = this.orderId
+      } else {
+        url = '/pay/getOrder'
+        params.orderId = this.orderId
       }
-      this.$api.post(url, params).then(res => {
-        this.detail = res.data;
-        this.loadStatus = 0;
-      }).catch(res => {
-        this.errorText = res.message;
-        this.loadStatus = 2;
-      }).finally(res => {
-        this.refresherTriggered = false;
-      })
+      this.$api
+        .post(url, params)
+        .then(res => {
+          this.detail = res.data
+          this.loadStatus = 0
+        })
+        .catch(res => {
+          this.errorText = res.message
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     toOrderDetail() {
-      this.$navToPage({
-        url: `/packageMaterial/pages/index?type=P`,
-      }, 'reLaunch');
+      this.$navToPage(
+        {
+          url: `/packageMaterial/pages/index?type=P`
+        },
+        'reLaunch'
+      )
     },
 
     backPage() {
-      this.crossPage.$emit('reScanCode', '');
-      this.$navToPage({
-        delta: 1
-      }, 'navigateBack')
-    }
-  },
-};
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+      this.crossPage.$emit('reScanCode', '')
+      this.$navToPage(
+        {
+          delta: 1
+        },
+        'navigateBack'
+      )
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/sale/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <view class="form-container">
       <!-- <view class="item" @tap="isShowBrandDialog = true">
@@ -47,10 +46,10 @@
 
     <template slot="footer">
       <view class="footer-btn-group">
-        <u-button
+        <!-- <u-button
           text="历史记录"
           @click="$navToPage({ url: `/packageMaterial/pages/sale/orderList?type=${type}` })"
-        ></u-button>
+        ></u-button> -->
         <u-button type="primary" text="选择产品" @click="toChooseProduct"></u-button>
       </view>
     </template>
@@ -94,152 +93,134 @@
     >
     </zjDialogPicker>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/sale/index`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
- // #ifdef H5
-import zjDialogPicker from "@/components/zj-dialog/zj-dialog-picker.vue";
+import zjDialogPicker from '@/components/zj-dialog/zj-dialog-picker.vue'
 
- export default {
-   components: {
-   	zjDialogPicker
-   },
+export default {
+  components: {
+    zjDialogPicker
+  },
 
-   data() {
-     return {
-       hasOid: false,
-       wbId: null, // 维保工单
-       wbIsAllFee: null, // 维保工单是否包含全部费用
-       wbPayType: null, // 维保工单费用支付方式
+  data() {
+    return {
+      hasOid: false,
+      wbId: null, // 维保工单
+      wbIsAllFee: null, // 维保工单是否包含全部费用
+      wbPayType: null, // 维保工单费用支付方式
 
-       type: 'M',
-       userMobile: '',
-       orderNo: '',
-       salesType: 'OUT',
-       brand: null,
-       brandList: [],
-       isShowBrandDialog: false,
-       category: null,
-       categoryList: [],
-       isShowCategoryDialog: false,
-       websit: null,
-       websitList: [],
-       isShowWebsitDialog: false,
-     }
-   },
+      type: 'M',
+      userMobile: '',
+      orderNo: '',
+      salesType: 'OUT',
+      brand: null,
+      brandList: [],
+      isShowBrandDialog: false,
+      category: null,
+      categoryList: [],
+      isShowCategoryDialog: false,
+      websit: null,
+      websitList: [],
+      isShowWebsitDialog: false
+    }
+  },
 
-   onLoad({type, oid = ''}) {
-     this.type = type;
-     this.hasOid = oid.length > 0;
-     uni.setNavigationBarTitle({
-     　title: type == 'M' ? '辅材收款' : '配件收款'
-     })
-     this.getBrandList();
-     this.getWebsitList();
-     if(type == 'P') {
-       this.getCategoryList();
-     }
-     if(this.hasOid) {
-       this.$api.post('/pg/order/base/detail', {
-         orderBaseId: oid,
-       }).then((res) => {
-         const data = res.data;
-         this.orderNo = oid;
-         this.userMobile = data.userMobile;
-         this.websit = {
-           websitId: data.websitId,
-           name: data.websitName,
-         }
-         if(data.pgOrderProducts && data.pgOrderProducts.length > 0) {
-           this.brand = {
-             id: data.pgOrderProducts[0].brandId,
-             brandName: data.pgOrderProducts[0].brandName
-           }
-         }
-         this.wbId = data.rpProjectRepairId || '';
-         this.wbIsAllFee = data.isAllFee || '';
-         this.wbPayType = data.feePayMethod || '';
-       })
-     }
-   },
+  onLoad({ type, oid = '' }) {
+    this.type = type
+    this.hasOid = oid.length > 0
+    uni.setNavigationBarTitle({
+      title: type == 'M' ? '辅材收款' : '配件收款'
+    })
+    this.getBrandList()
+    this.getWebsitList()
+    if (type == 'P') {
+      this.getCategoryList()
+    }
+    if (this.hasOid) {
+      this.$api
+        .post('/pg/order/base/detail', {
+          orderBaseId: oid
+        })
+        .then(res => {
+          const data = res.data
+          this.orderNo = oid
+          this.userMobile = data.userMobile
+          this.websit = {
+            websitId: data.websitId,
+            name: data.websitName
+          }
+          if (data.pgOrderProducts && data.pgOrderProducts.length > 0) {
+            this.brand = {
+              id: data.pgOrderProducts[0].brandId,
+              brandName: data.pgOrderProducts[0].brandName
+            }
+          }
+          this.wbId = data.rpProjectRepairId || ''
+          this.wbIsAllFee = data.isAllFee || ''
+          this.wbPayType = data.feePayMethod || ''
+        })
+    }
+  },
 
-   methods: {
-     getBrandList() {
-       this.$api.post('/pay/getBrand')
-       .then(res => {
-         this.brandList = res.data;
-       })
-     },
+  methods: {
+    getBrandList() {
+      this.$api.post('/pay/getBrand').then(res => {
+        this.brandList = res.data
+      })
+    },
 
-     getCategoryList() {
-       this.$api.post('/pay/getCategoryList')
-       .then(res => {
-         this.categoryList = res.data;
-       })
-     },
+    getCategoryList() {
+      this.$api.post('/pay/getCategoryList').then(res => {
+        this.categoryList = res.data
+      })
+    },
 
-     getWebsitList() {
-       this.$api.get('/user/apply/websit')
-       .then(res => {
-         this.websitList = res.data;
-         if (this.websitList.length == 1) {
+    getWebsitList() {
+      this.$api.get('/user/apply/websit').then(res => {
+        this.websitList = res.data
+        if (this.websitList.length == 1) {
           this.websit = this.websitList[0]
-         }
-       })
-     },
+        }
+      })
+    },
 
-     confirmBrandDialog(e) {
-       this.brand = this.brandList[e[0]];
-       this.isShowBrandDialog = false;
-     },
+    confirmBrandDialog(e) {
+      this.brand = this.brandList[e[0]]
+      this.isShowBrandDialog = false
+    },
 
-     confirmCategoryDialog(e) {
-       this.category = this.categoryList[e[0]];
-       this.isShowCategoryDialog = false;
-     },
+    confirmCategoryDialog(e) {
+      this.category = this.categoryList[e[0]]
+      this.isShowCategoryDialog = false
+    },
 
-     confirmWebsitDialog(e) {
-       this.websit = this.websitList[e[0]];
-       this.isShowWebsitDialog = false;
-     },
+    confirmWebsitDialog(e) {
+      this.websit = this.websitList[e[0]]
+      this.isShowWebsitDialog = false
+    },
 
-     toChooseProduct() {
+    toChooseProduct() {
       //  if(!this.brand) return this.$toast('请选择品牌');
-       if(this.type == 'P' && !this.category) return this.$toast('请选择产品大类');
-       if(!this.websit) return this.$toast('请选择所属网点');
-       if(!this.userMobile) return this.$toast('请输入客户电话');
+      if (this.type == 'P' && !this.category) return this.$toast('请选择产品大类')
+      if (!this.websit) return this.$toast('请选择所属网点')
+      if (!this.userMobile) return this.$toast('请输入客户电话')
       //  if(!(/^1[3456789]\d{9}$/.test(this.userMobile)) || this.userMobile.length != 11) return this.$toast('请填写正确的客户电话');
       //  this.$navToPage({
       //    url: `/packageMaterial/pages/sale/product?type=${this.type}&brandId=${this.brand.id}&brandName=${this.brand.brandName}&categoryId=${this.type=='P'?this.category.categoryId:''}&categoryName=${this.type=='P'?this.category.name:''}&salesType=${this.salesType}&userMobile=${this.userMobile}&orderNo=${this.orderNo}&websitId=${this.websit.websitId}&websitName=${this.websit.name}&wbId=${this.wbId||''}&wbIsAllFee=${this.wbIsAllFee||''}&wbPayType=${this.wbPayType||''}`
       //  })
-       this.$navToPage({
-         url: `/packageMaterial/pages/sale/product?type=${this.type}&categoryId=${this.type=='P'?this.category.categoryId:''}&categoryName=${this.type=='P'?this.category.name:''}&userMobile=${this.userMobile}&orderNo=${this.orderNo}&websitId=${this.websit.websitId}&websitName=${this.websit.name}&wbId=${this.wbId||''}&wbIsAllFee=${this.wbIsAllFee||''}&wbPayType=${this.wbPayType||''}`
-       })
-     },
-   },
- }
-
- // #endif
- // #ifndef H5
- export default {
-   data() {
-     return {
-       pam: {},
-     }
-   },
-   onLoad(pam) {
-     this.pam = pam;
-   }
- }
- // #endif
+      this.$navToPage({
+        url: `/packageMaterial/pages/sale/product?type=${this.type}&categoryId=${
+          this.type == 'P' ? this.category.categoryId : ''
+        }&categoryName=${this.type == 'P' ? this.category.name : ''}&userMobile=${this.userMobile}&orderNo=${
+          this.orderNo
+        }&websitId=${this.websit.websitId}&websitName=${this.websit.name}&wbId=${this.wbId || ''}&wbIsAllFee=${
+          this.wbIsAllFee || ''
+        }&wbPayType=${this.wbPayType || ''}`
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/sale/order.vue

@@ -171,7 +171,7 @@ export default {
         })
         .then(res => {
           this.$navToPage({
-            url: `/packageMaterial/pages/sale/pay?handleOrderId=${res.data}&wbId=`
+            url: `/packageMaterial/pages/sale/pay?handleOrderId=${res.data}`
           })
         })
     }

src/packageMaterial/pages/sale/orderDetail.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <view class="all-container">
     <view class="bg"></view>
     <Loading :type="3" :loadStatus="loadStatus" :showText="errorText" />
@@ -79,41 +78,32 @@
       </template>
     </zj-page-layout>
   </view>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/sale/orderDetail`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     statusFilter(val) {
       const MAP = {
         WAIT: '待支付',
         PAID: '已支付',
-        CANCEL: '已取消',
+        CANCEL: '已取消'
       }
-      return MAP[val];
+      return MAP[val]
     },
     salesTypeFilter(val) {
       const MAP = {
         OWN: '自有出库',
-        OUT: '外购销售',
+        OUT: '外购销售'
       }
-      return MAP[val];
+      return MAP[val]
     },
     payTypeFilter(val) {
       const MAP = {
         WECHAT: '微信支付',
-        LINE: '线下支付',
+        LINE: '线下支付'
       }
-      return MAP[val];
+      return MAP[val]
     }
   },
 
@@ -122,66 +112,60 @@ export default {
       id: null,
       refresherTriggered: false,
       loadStatus: 0,
-		errorText: '',
-      detail: null,
+      errorText: '',
+      detail: null
     }
   },
 
-  onLoad({id}) {
-    this.id = id;
-    this.getDetail();
+  onLoad({ id }) {
+    this.id = id
+    this.getDetail()
   },
 
   methods: {
     getDetail() {
-      this.$api.post('/pay/getOrder', {
-        orderId: this.id
-      }).then(res => {
-        this.detail = res.data;
-        this.loadStatus = 0;
-      }).catch(res => {
-    		this.errorText = res.message;
-    		this.loadStatus = 2;
-    	}).finally(res => {
-    		this.refresherTriggered = false;
-    	})
+      this.$api
+        .post('/pay/getOrder', {
+          orderId: this.id
+        })
+        .then(res => {
+          this.detail = res.data
+          this.loadStatus = 0
+        })
+        .catch(res => {
+          this.errorText = res.message
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     // 下拉刷新
     refresherrefresh() {
-      this.refresherTriggered = true;
-      this.getDetail();
+      this.refresherTriggered = true
+      this.getDetail()
     },
 
     // 取消订单
     cancelOrder() {
       this.$modal({
         content: '确认取消订单吗？'
-      }).then(() => {
-        this.$api.post('/pay/cancel', {
-          orderId: this.id
-        }).then(res => {
-          this.$successToast();
-          this.getDetail();
+      })
+        .then(() => {
+          this.$api
+            .post('/pay/cancel', {
+              orderId: this.id
+            })
+            .then(res => {
+              this.$successToast()
+              this.getDetail()
+            })
         })
-      }).catch(() => {})
+        .catch(() => {})
     }
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
-    }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/sale/orderList.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout
     :isScroll="true"
+    :hasFooter="true"
     :refresherTriggered="refresherTriggered"
     @refresherrefresh="refresherrefresh"
     @scrolltolower="scrolltolower"
@@ -48,7 +48,7 @@
     </template>
 
     <view class="list-container">
-      <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
+      <view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item)">
         <view class="row top">
           <view class="label">制单时间</view>
           <view class="value">{{ item.createTime }}</view>
@@ -82,6 +82,17 @@
         </view>
         <view class="btns" v-if="item.payStatus == 'WAIT'" @tap.stop>
           <u-button text="取消订单" @click="cancelOrder(item)"></u-button>
+          <u-button
+            text="去收款"
+            type="primary"
+            @click="
+              () => {
+                $navToPage({
+                  url: `/packageMaterial/pages/sale/pay?handleOrderId=${item.id}`
+                })
+              }
+            "
+          ></u-button>
         </view>
       </view>
     </view>
@@ -97,198 +108,196 @@
       @close="isShowDatePicker = false"
       @confirm="confirmDate"
     ></u-datetime-picker>
-  </zj-page-layout>
-  <!-- #endif -->
 
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/sale/orderList`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
+    <template slot="footer">
+      <view class="bottom-container" style="box-sizing: border-box; padding: 20rpx">
+        <u-button
+          text="创建辅材收款"
+          type="primary"
+          @click="
+            () => {
+              $navToPage({
+                url: `/packageMaterial/pages/sale/index?type=M`
+              })
+            }
+          "
+        >
+        </u-button>
+      </view>
+    </template>
+  </zj-page-layout>
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     statusFilter(val) {
       const MAP = {
         WAIT: '待支付',
         PAID: '已支付',
-        CANCEL: '已取消',
+        CANCEL: '已取消'
       }
-      return MAP[val];
+      return MAP[val]
     },
     salesTypeFilter(val) {
       const MAP = {
         OWN: '自有出库',
-        OUT: '外购销售',
+        OUT: '外购销售'
       }
-      return MAP[val];
-    },
+      return MAP[val]
+    }
   },
 
   data() {
     return {
       type: 'M',
-		dataList: [],
-		pageNum: 1,
-		loadStatus: 0,
+      dataList: [],
+      pageNum: 1,
+      loadStatus: 0,
       refresherTriggered: false,
       tabList: [
-        {name: '全部', value: '', badge: {value: 0}},
-        {name: '待支付', value: 'WAIT', badge: {value: 0}},
-        {name: '已支付', value: 'PAID', badge: {value: 0}},
-        {name: '已取消', value: 'CANCEL', badge: {value: 0}},
+        { name: '全部', value: '', badge: { value: 0 } },
+        { name: '待支付', value: 'WAIT', badge: { value: 0 } },
+        { name: '已支付', value: 'PAID', badge: { value: 0 } },
+        { name: '已取消', value: 'CANCEL', badge: { value: 0 } }
       ],
       tabCurrent: 0,
       status: '',
       salesTypeList: [
-        {name: '全部', value: ''},
-        {name: '自有仓库', value: 'OWN'},
-        {name: '外购销售', value: 'OUT'},
+        { name: '全部', value: '' },
+        { name: '自有仓库', value: 'OWN' },
+        { name: '外购销售', value: 'OUT' }
       ],
       salesTypeCurrent: 0,
       salesType: '',
       isShowDatePicker: false,
       datePickerValue: Number(new Date()),
-      date: '',
+      date: ''
     }
   },
 
-  onLoad({type}) {
-    this.type = type;
-    this.getCount();
-    this.getList();
+  onLoad({ type }) {
+    this.type = type
+    this.getCount()
+    this.getList()
   },
 
   methods: {
     getCount() {
-    	this.$api.post('/pay/orderCount', {
-        goodsType: this.type,
-      }).then(res => {
-        if(!res.data) return false;
-    		// this.tabList[0].badge.value = res.data.qb || 0;
-    		this.tabList[1].badge.value = res.data.dzf || 0;
-    		// this.tabList[2].badge.value = res.data.yzf || 0;
-    		this.tabList[3].badge.value = res.data.yqx || 0;
-    	})
+      this.$api
+        .post('/pay/orderCount', {
+          goodsType: this.type
+        })
+        .then(res => {
+          if (!res.data) return false
+          // this.tabList[0].badge.value = res.data.qb || 0;
+          this.tabList[1].badge.value = res.data.dzf || 0
+          // this.tabList[2].badge.value = res.data.yzf || 0;
+          this.tabList[3].badge.value = res.data.yqx || 0
+        })
     },
 
     getList() {
-    	this.loadStatus = 1;
-    	this.$api.post('/pay/orderPage', {
-        pageNum: this.pageNum,
-        pageSize: 10,
-        payStatus: this.status,
-        yearMonth: this.date,
-        goodsType: this.type,
-        settlementType: this.salesType
-    	}).then(res => {
-    		this.loadStatus = 0;
-    		let list = res.data.records;
-    		if (list.length < 10) {
-    		  this.loadStatus = 2;
-    		}
-    		this.dataList = this.dataList.concat(list);
-    	}).catch(() => {
-    		this.loadStatus = 2;
-    	}).finally(res => {
-    		this.refresherTriggered = false;
-    	})
+      this.loadStatus = 1
+      this.$api
+        .post('/pay/orderPage', {
+          pageNum: this.pageNum,
+          pageSize: 10,
+          payStatus: this.status,
+          yearMonth: this.date,
+          goodsType: this.type,
+          settlementType: this.salesType
+        })
+        .then(res => {
+          this.loadStatus = 0
+          let list = res.data.records
+          if (list.length < 10) {
+            this.loadStatus = 2
+          }
+          this.dataList = this.dataList.concat(list)
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     changeTab(e) {
-    	this.tabCurrent = e.index;
-    	this.status = e.value;
-      this.refreshList();
+      this.tabCurrent = e.index
+      this.status = e.value
+      this.refreshList()
     },
 
     changeSalesType(e) {
-      this.salesTypeCurrent = e.index;
-      this.salesType = e.value;
-      this.refreshList();
+      this.salesTypeCurrent = e.index
+      this.salesType = e.value
+      this.refreshList()
     },
 
     resetDate() {
-      this.isShowDatePicker = false;
-      this.date = '';
-      this.refreshList();
+      this.isShowDatePicker = false
+      this.date = ''
+      this.refreshList()
     },
 
     confirmDate(e) {
-      this.isShowDatePicker = false;
+      this.isShowDatePicker = false
       let time = new Date(e.value)
-      let y = time.getFullYear();
-      let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
-      this.date = `${y}-${m}`;
-      this.refreshList();
+      let y = time.getFullYear()
+      let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
+      this.date = `${y}-${m}`
+      this.refreshList()
     },
 
     refreshList() {
-    	this.dataList = [];
-    	this.pageNum = 1;
-    	this.getList();
+      this.dataList = []
+      this.pageNum = 1
+      this.getList()
     },
 
     // 滚动到底部
     scrolltolower(e) {
-    	if (this.loadStatus === 0) {
-    		this.pageNum++;
-    		this.getList();
-    	}
+      if (this.loadStatus === 0) {
+        this.pageNum++
+        this.getList()
+      }
     },
 
     // 触发下拉刷新
     refresherrefresh(e) {
-    	this.refresherTriggered = true;
-      this.getCount();
-    	this.refreshList();
+      this.refresherTriggered = true
+      this.getCount()
+      this.refreshList()
     },
 
     toDetail(item) {
-      if (item.goodsTyp == 'M') {
-        this.$navToPage({
-          url: `/packageMaterial/pages/sale/orderDetail?id=${item.orderId}`
-        })
-      } else if (item.goodsTyp == 'P') {
-        this.$navToPage({
-          url: `/packageMaterial/pages/newSale/orderDetail?id=${item.orderId}`
-        })
-      }
+      this.$navToPage({
+        url: `/packageMaterial/pages/sale/orderDetail?id=${item.orderId}`
+      })
     },
 
     // 取消订单
     cancelOrder(item) {
       this.$modal({
         content: '确认取消订单吗？'
-      }).then(() => {
-        this.$api.post('/pay/cancel', {
-          orderId: item.orderId
-        }).then(res => {
-          this.$successToast();
-          this.getCount();
-          this.refreshList();
+      })
+        .then(() => {
+          this.$api
+            .post('/pay/cancel', {
+              orderId: item.orderId
+            })
+            .then(res => {
+              this.$successToast()
+              this.getCount()
+              this.refreshList()
+            })
         })
-      }).catch(() => {})
-    },
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+        .catch(() => {})
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/sale/pay.vue

@@ -12,11 +12,7 @@
           </view>
           <view class="id"><text>订单号：</text>{{ detail.orderId }}</view>
           <view class="product">
-            <view
-              class="it"
-              v-for="(item, index) in wbId ? detail.rpMaterialOrderItems : detail.workerOrderItems"
-              :key="index"
-            >
+            <view class="it" v-for="(item, index) in detail.workerOrderItems" :key="index">
               <view class="name"
                 >{{ item.goodsName }}<text>×{{ item.num }}{{ item.unit }}</text></view
               >
@@ -61,7 +57,6 @@ export default {
   data() {
     return {
       orderId: null,
-      wbId: null,
       refresherTriggered: false,
       loadStatus: 0,
       errorText: '',
@@ -74,9 +69,8 @@ export default {
     }
   },
 
-  onLoad({ handleOrderId, wbId }) {
+  onLoad({ handleOrderId }) {
     this.orderId = handleOrderId
-    this.wbId = wbId
     this.getDetail()
     this.crossPage.$on('reScanCode', () => {
       this.scanCode()
@@ -162,14 +156,8 @@ export default {
 
     // 下单
     submitData(code) {
-      let url = ''
-      if (this.wbId) {
-        url = '/engin/material/paid'
-      } else {
-        url = '/pay/paid'
-      }
       this.$api
-        .post(url, {
+        .post('/pay/paid', {
           authCode: code,
           orderId: this.orderId,
           payType: 'WECHAT'
@@ -227,15 +215,8 @@ export default {
     },
 
     confirmPay() {
-      let url = ''
-      if (this.wbId) {
-        url = '/engin/material/paid'
-      } else {
-        url = '/pay/paid'
-      }
-
       this.$api
-        .post(url, {
+        .post('/pay/paid', {
           authCode: '',
           orderId: this.orderId,
           payType: 'LINE'
@@ -243,11 +224,11 @@ export default {
         .then(res => {
           if (res.data) {
             this.$navToPage({
-              url: `/packageMaterial/pages/sale/result?handleOrderId=${this.orderId}&result=1&wbId=${this.wbId || ''}`
+              url: `/packageMaterial/pages/sale/result?handleOrderId=${this.orderId}&result=1`
             })
           } else {
             this.$navToPage({
-              url: `/packageMaterial/pages/sale/result?handleOrderId=${this.orderId}&result=0&wbId=${this.wbId || ''}`
+              url: `/packageMaterial/pages/sale/result?handleOrderId=${this.orderId}&result=0`
             })
           }
         })

src/packageMaterial/pages/sale/product.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <zj-page-layout :hasFooter="true">
     <template slot="header">
       <view class="search-container">
@@ -127,18 +126,9 @@
       </view>
     </template>
   </zj-page-layout>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/sale/product`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   data() {
     return {
@@ -155,13 +145,13 @@ export default {
       wbPayType: null, // 维保工单费用支付方式
 
       keyword: '',
-		leftList: [],
-		leftCurrent: 0,
-		rightList: [],
+      leftList: [],
+      leftCurrent: 0,
+      rightList: [],
       loadStatus: 0,
       isShowDialog: false,
 
-      cartList: [],
+      cartList: []
     }
   },
 
@@ -171,182 +161,207 @@ export default {
       // this.cartList.forEach(item => {
       //   val = val + item.num;
       // })
-      return this.cartList.length;
+      return this.cartList.length
     },
     totalPrice() {
-      let val = 0;
+      let val = 0
       this.cartList.forEach(item => {
-        val = val + (item.num * (item.goodsAmount * 100) / 100);
+        val = val + (item.num * (item.goodsAmount * 100)) / 100
       })
-      return val;
-    },
+      return val
+    }
   },
 
-  onLoad({type, userMobile, orderNo, salesType, brandId, brandName, categoryId, categoryName, websitId, websitName, wbId, wbIsAllFee, wbPayType}) {
-    this.type = type;
-    this.userMobile = userMobile;
-    this.orderNo = orderNo;
+  onLoad({
+    type,
+    userMobile,
+    orderNo,
+    salesType,
+    brandId,
+    brandName,
+    categoryId,
+    categoryName,
+    websitId,
+    websitName,
+    wbId,
+    wbIsAllFee,
+    wbPayType
+  }) {
+    this.type = type
+    this.userMobile = userMobile
+    this.orderNo = orderNo
     // this.salesType = salesType;
     // this.brandId = brandId;
     // this.brandName = brandName;
-    this.categoryId = categoryId;
-    this.categoryName = categoryName;
-    this.websitId = websitId;
-    this.websitName = websitName;
-    this.wbId = wbId;
-    this.wbIsAllFee = wbIsAllFee;
-    this.wbPayType = wbPayType;
+    this.categoryId = categoryId
+    this.categoryName = categoryName
+    this.websitId = websitId
+    this.websitName = websitName
+    this.wbId = wbId
+    this.wbIsAllFee = wbIsAllFee
+    this.wbPayType = wbPayType
 
     uni.setNavigationBarTitle({
-    　title: type == 'M' ? '选择辅材' : '选择配件'
+      title: type == 'M' ? '选择辅材' : '选择配件'
     })
-    if(type === 'M') {
-      this.getLeftList();
-    }else {
-      this.getRightList();
+    if (type === 'M') {
+      this.getLeftList()
+    } else {
+      this.getRightList()
     }
   },
 
   methods: {
     // 获取左侧分类
     getLeftList() {
-    	this.$api.post('/pay/websitCategoryList', {
-        pageNum: 1,
-        pageSize: -1,
-      }).then(res => {
-    		this.leftList = res.data.records;
-    		this.leftCurrent = res.data.records.length > 0 ? res.data.records[0].categoryId : 0;
-    		this.getRightList();
-    	})
+      this.$api
+        .post('/pay/websitCategoryList', {
+          pageNum: 1,
+          pageSize: -1
+        })
+        .then(res => {
+          this.leftList = res.data.records
+          this.leftCurrent = res.data.records.length > 0 ? res.data.records[0].categoryId : 0
+          this.getRightList()
+        })
     },
 
     // 获取右侧产品
     getRightList() {
-    	this.loadStatus = 1;
-      let url = '', params = {};
-      if(this.type === 'M') {
-        url = '/pay/chargeList';
+      this.loadStatus = 1
+      let url = '',
+        params = {}
+      if (this.type === 'M') {
+        url = '/pay/chargeList'
         params = {
           categoryId: this.leftCurrent,
-          orderId: this.orderNo,
+          orderId: this.orderNo
         }
-      }else {
-        url = '/pay/websitGoodsList';
+      } else {
+        url = '/pay/websitGoodsList'
         params = {
           categoryName: this.categoryName,
           brand: this.brandName,
-          orderId: this.orderNo,
+          orderId: this.orderNo
           // normType: 'M'
         }
       }
 
-    	this.$api.post(url, {
-        pageNum: 1,
-        pageSize: -1,
-        name: this.keyword,
-        ...params
-    	}).then(res => {
-    		this.loadStatus = 0;
-        let list = res.data.records.map(item => {
-          return this.type === 'M' ? {
-            goodsId: item.normId,
-            goodsName: item.normName,
-            goodsCode: item.normCode,
-            goodsUnit: item.unit,
-            goodsAmount: item.normAmount,
-            num: 0
-          } : {
-            goodsId: item.goodsId,
-            goodsName: item.goodsName,
-            goodsCode: item.goodsCode,
-            goodsUnit: item.goodsSalesUnit,
-            goodsAmount: item.normAmount,
-            normType: item.normType,
-            num: 0
-          }
-        });
-        for(let i = 0; i < list.length; i++) {
-          for(let j = 0; j < this.cartList.length; j++) {
-            if(list[i].goodsId == this.cartList[j].goodsId) {
-              list[i].num = this.cartList[j].num;
+      this.$api
+        .post(url, {
+          pageNum: 1,
+          pageSize: -1,
+          name: this.keyword,
+          ...params
+        })
+        .then(res => {
+          this.loadStatus = 0
+          let list = res.data.records.map(item => {
+            return this.type === 'M'
+              ? {
+                  goodsId: item.normId,
+                  goodsName: item.normName,
+                  goodsCode: item.normCode,
+                  goodsUnit: item.unit,
+                  goodsAmount: item.normAmount,
+                  num: 0
+                }
+              : {
+                  goodsId: item.goodsId,
+                  goodsName: item.goodsName,
+                  goodsCode: item.goodsCode,
+                  goodsUnit: item.goodsSalesUnit,
+                  goodsAmount: item.normAmount,
+                  normType: item.normType,
+                  num: 0
+                }
+          })
+          for (let i = 0; i < list.length; i++) {
+            for (let j = 0; j < this.cartList.length; j++) {
+              if (list[i].goodsId == this.cartList[j].goodsId) {
+                list[i].num = this.cartList[j].num
+              }
             }
           }
-        }
-    		if(list.length < 1){
-    			this.loadStatus = 2;
-    		}
-    		this.rightList = list;
-    	}).catch(() => {
-    		this.loadStatus = 2;
-    	})
+          if (list.length < 1) {
+            this.loadStatus = 2
+          }
+          this.rightList = list
+        })
+        .catch(() => {
+          this.loadStatus = 2
+        })
     },
 
     // 切换一级菜单
     changeLeft(pid) {
-    	this.leftCurrent = pid;
-    	this.getRightList();
+      this.leftCurrent = pid
+      this.getRightList()
     },
 
     // 搜索
     searchData() {
-      this.getRightList();
+      this.getRightList()
     },
 
     changeNum(e) {
-      let obj = this.rightList.find((item) => item.goodsId === e.name);
-      if(e.unit && e.unit != '米') {
-        e.value = Math.floor(e.value);
-        obj.num = Math.floor(obj.num);
+      let obj = this.rightList.find(item => item.goodsId === e.name)
+      if (e.unit && e.unit != '米') {
+        e.value = Math.floor(e.value)
+        obj.num = Math.floor(obj.num)
       }
       // 判断对象数组中是否存在该对象
-      let index = this.cartList.findIndex((item) => item.goodsId === obj.goodsId);
+      let index = this.cartList.findIndex(item => item.goodsId === obj.goodsId)
       // 如果是0，就删除
-      if(index !== -1 && e.value == 0) {
-        this.cartList.splice(index, 1);
+      if (index !== -1 && e.value == 0) {
+        this.cartList.splice(index, 1)
       }
       // 如果有就替换，没有就添加
       else if (index !== -1) {
-      	this.cartList.splice(index, 1, obj);
-      }
-      else {
-        if(e.value > 0) {
-          this.cartList.push(obj);
+        this.cartList.splice(index, 1, obj)
+      } else {
+        if (e.value > 0) {
+          this.cartList.push(obj)
         }
       }
     },
 
     changeCartNum(e) {
-      let obj = this.cartList.find((item) => item.goodsId === e.name);
-      if(e.unit && e.unit != '米') {
-        e.value = Math.floor(e.value);
-        obj.num = Math.floor(obj.num);
+      let obj = this.cartList.find(item => item.goodsId === e.name)
+      if (e.unit && e.unit != '米') {
+        e.value = Math.floor(e.value)
+        obj.num = Math.floor(obj.num)
       }
-      let index = this.cartList.findIndex((item) => item.goodsId === obj.goodsId);
-      this.cartList.splice(index, 1, obj);
+      let index = this.cartList.findIndex(item => item.goodsId === obj.goodsId)
+      this.cartList.splice(index, 1, obj)
 
-      this.getRightList();
+      this.getRightList()
     },
 
     overlimitFun(index) {
       this.$modal({
         content: '把该产品从购物车移除？'
-      }).then(() => {
-        this.cartList.splice(index, 1);
-        this.getRightList();
-      }).catch(() => {})
+      })
+        .then(() => {
+          this.cartList.splice(index, 1)
+          this.getRightList()
+        })
+        .catch(() => {})
     },
 
     clearCart() {
       this.$modal({
         content: '确定清空购物车？'
-      }).then(() => {
-        this.cartList = [];
-        this.getRightList();
-      }).catch(() => {})
+      })
+        .then(() => {
+          this.cartList = []
+          this.getRightList()
+        })
+        .catch(() => {})
     },
 
     submitData() {
-      if(this.cartList.length < 1) return this.$toast('请选择');
+      if (this.cartList.length < 1) return this.$toast('请选择')
       this.$setStorage('materialSaleData', {
         type: this.type,
         salesType: this.salesType,
@@ -361,28 +376,13 @@ export default {
         wbIsAllFee: this.wbIsAllFee,
         wbPayType: this.wbPayType,
         goodsList: this.cartList
-      });
+      })
       this.$navToPage({
         url: `/packageMaterial/pages/sale/order`
       })
-    },
-
-  },
-}
-
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/packageMaterial/pages/sale/result.vue

@@ -1,5 +1,4 @@
 <template>
-  <!-- #ifdef H5 -->
   <view>
     <Loading :type="3" :loadStatus="loadStatus" :showText="errorText" />
     <zj-page-layout v-if="detail" :hasFooter="true">
@@ -49,26 +48,17 @@
       </template>
     </zj-page-layout>
   </view>
-  <!-- #endif -->
-
-  <!-- #ifndef H5 -->
-  <web-view
-    :src="webViewHref(`/packageMaterial/pages/sale/result`, pam, crossPagePam)"
-    @message="crossPage.$listener"
-  ></web-view>
-  <!-- #endif -->
 </template>
 
 <script>
-// #ifdef H5
 export default {
   filters: {
     payTypeFilter(val) {
       const MAP = {
         WECHAT: '微信支付',
-        LINE: '线下支付',
+        LINE: '线下支付'
       }
-      return MAP[val];
+      return MAP[val]
     }
   },
 
@@ -81,64 +71,62 @@ export default {
       errorText: '',
       detail: null,
       result: 0
-    };
+    }
   },
 
   onLoad({ handleOrderId, result, wbId }) {
-    this.orderId = handleOrderId;
-    this.result = Number(result);
-    this.wbId = wbId;
-    this.getDetail();
+    this.orderId = handleOrderId
+    this.result = Number(result)
+    this.wbId = wbId
+    this.getDetail()
   },
 
   methods: {
     getDetail() {
-      let url = '', params = {};
-      if(this.wbId) {
-        url = '/engin/material/detail';
-        params.id = this.orderId;
-      }else {
-        url = '/pay/getOrder';
-        params.orderId = this.orderId;
+      let url = '',
+        params = {}
+      if (this.wbId) {
+        url = '/engin/material/detail'
+        params.id = this.orderId
+      } else {
+        url = '/pay/getOrder'
+        params.orderId = this.orderId
       }
-      this.$api.post(url, params).then(res => {
-        this.detail = res.data;
-        this.loadStatus = 0;
-      }).catch(res => {
-        this.errorText = res.message;
-        this.loadStatus = 2;
-      }).finally(res => {
-        this.refresherTriggered = false;
-      })
+      this.$api
+        .post(url, params)
+        .then(res => {
+          this.detail = res.data
+          this.loadStatus = 0
+        })
+        .catch(res => {
+          this.errorText = res.message
+          this.loadStatus = 2
+        })
+        .finally(res => {
+          this.refresherTriggered = false
+        })
     },
 
     toOrderDetail() {
-      this.$navToPage({
-        url: `/packageMaterial/pages/index?type=M`,
-      }, 'reLaunch');
+      this.$navToPage(
+        {
+          url: `/packageMaterial/pages/index?type=M`
+        },
+        'reLaunch'
+      )
     },
 
     backPage() {
-      this.crossPage.$emit('reScanCode', '');
-      this.$navToPage({
-        delta: 1
-      }, 'navigateBack')
-    }
-  },
-};
-// #endif
-// #ifndef H5
-export default {
-  data() {
-    return {
-      pam: {},
+      this.crossPage.$emit('reScanCode', '')
+      this.$navToPage(
+        {
+          delta: 1
+        },
+        'navigateBack'
+      )
     }
-  },
-  onLoad(pam) {
-    this.pam = pam;
   }
 }
-// #endif
 </script>
 
 <style lang="scss" scoped>

src/pages/index/index.vue

@@ -368,12 +368,14 @@ export default {
       otherList: [
         // 其他列表
         { code: 1, title: '辅材管理', url: `/packageMaterial/pages/stock/index` },
-        { code: 2, title: '辅材收款', url: `/packageMaterial/pages/sale/index?type=M` }
+        { code: 2, title: '辅材收款', url: `/packageMaterial/pages/sale/orderList?type=M` }
+        // { code: 2, title: '辅材收款', url: `/packageMaterial/pages/sale/index?type=M` }
       ],
       otherList2: [
         // 其他列表
         { code: 1, title: '配件管理', url: `/packageAttachment/pages/fittingsManagement/index` },
-        { code: 2, title: '配件收款', url: `/packageMaterial/pages/newSale/index?type=P` }
+        { code: 2, title: '配件收款', url: `/packageMaterial/pages/newSale/orderList?type=P` }
+        // { code: 2, title: '配件收款', url: `/packageMaterial/pages/newSale/index?type=P` }
       ],
       bannerList: [], // 轮播图列表
       couponList: [], // 可领取优惠券列表