Просмотр исходного кода

Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

# Conflicts:
#	package-sales/pages/choose-goods/choose-goods.js
#	package-sales/pages/choose-goods/choose-goods.json
#	package-sales/pages/choose-goods/choose-goods.wxml
#	package-sales/pages/choose-goods/choose-goods.wxss
#	package-sales/pages/order-billing/add/add.js
#	package-sales/pages/order-billing/add/add.json
#	package-sales/pages/order-billing/add/add.wxml
#	package-sales/pages/order-billing/add/add.wxss
#	package-sales/pages/order-billing/order-billing.js
#	package-sales/pages/order-billing/order-billing.json
#	package-sales/pages/order-billing/order-billing.wxml
#	package-sales/pages/order-billing/order-billing.wxss
wangyingjie 2 лет назад
Родитель
Сommit
a72fdb7661
35 измененных файлов с 2314 добавлено и 533 удалено
  1. 29 34
      app.json
  2. 0 66
      package-basic-data/pages/customer-reception/collection/collection.js
  3. 0 3
      package-basic-data/pages/customer-reception/collection/collection.json
  4. 0 2
      package-basic-data/pages/customer-reception/collection/collection.wxml
  5. 0 1
      package-basic-data/pages/customer-reception/collection/collection.wxss
  6. 174 62
      package-purchase/pages/purchase-order/add/add.js
  7. 2 1
      package-purchase/pages/purchase-order/add/add.json
  8. 603 2
      package-purchase/pages/purchase-order/add/add.wxml
  9. 468 1
      package-purchase/pages/purchase-order/add/add.wxss
  10. 188 62
      package-purchase/pages/purchase-order/purchase-order.js
  11. 251 2
      package-purchase/pages/purchase-order/purchase-order.wxml
  12. 394 1
      package-purchase/pages/purchase-order/purchase-order.wxss
  13. 0 66
      package-sales/pages/detail/detail.js
  14. 0 3
      package-sales/pages/detail/detail.json
  15. 0 2
      package-sales/pages/detail/detail.wxml
  16. 0 1
      package-sales/pages/detail/detail.wxss
  17. 0 66
      package-sales/pages/order-billing/collection/collection.js
  18. 0 3
      package-sales/pages/order-billing/collection/collection.json
  19. 0 2
      package-sales/pages/order-billing/collection/collection.wxml
  20. 0 1
      package-sales/pages/order-billing/collection/collection.wxss
  21. 0 66
      package-sales/pages/order-billing/deal/deal.js
  22. 0 3
      package-sales/pages/order-billing/deal/deal.json
  23. 0 2
      package-sales/pages/order-billing/deal/deal.wxml
  24. 0 1
      package-sales/pages/order-billing/deal/deal.wxss
  25. 11 7
      pages/home-page/home-page.wxml
  26. 16 4
      pages/home-page/home-page.wxss
  27. 13 12
      pages/index/index.wxml
  28. 8 0
      pages/index/index.wxss
  29. 5 1
      pages/login/login.js
  30. 5 1
      pages/login/login.json
  31. 11 2
      pages/login/login.wxml
  32. 50 1
      pages/login/login.wxss
  33. 48 39
      pages/mine/mine.js
  34. 38 13
      pages/mine/mine.wxml
  35. BIN
      static/img/diamond.png

+ 29 - 34
app.json

@@ -1,10 +1,10 @@
 {
     "pages": [
-        "pages/index/index", 
+        "pages/login/login",
+        "pages/index/index",
         "pages/home-page/home-page",
         "pages/shopping/shopping",
-        "pages/mine/mine",
-        "pages/login/login",
+        "pages/mine/mine",        
         "pages/ec-canvas/ec-canvas-new"
     ],
     "subPackages": [
@@ -32,19 +32,13 @@
                 "pages/customer-reception/detail/detail",
                 "pages/customer-follow-up/add/add",
                 "pages/customer-follow-up/detail/detail",
-                "pages/customer-follow-up/follow-up-tasks/follow-up-tasks" 
+                "pages/customer-follow-up/follow-up-tasks/follow-up-tasks"
             ]
-        },
+        }, 
         {
             "root": "package-sales",
             "name": "package-sales",
-            "pages": [
-                "pages/order-billing/order-billing",
-                "pages/choose-goods/choose-goods",
-                "pages/order-billing/add/add",
-                "pages/order-billing/deal/deal",
-                "pages/order-billing/Collection/Collection",
-                "pages/detail/detail"            ]
+            "pages": []
         },
         {
             "root": "package-inventory",
@@ -52,28 +46,29 @@
             "pages": []
         },
         {
-            "root": "package-purchase",
-            "name": "package-purchase",
-            "pages": [
-                "pages/purchase-order/purchase-order",
-                "pages/purchase-order/add/add",
-                "pages/purchase-order/purchase-return-repla-sup/purchase-return-repla-sup",
-                "pages/purchase-order/select-source-sheet/select-source-sheet",
-                "pages/purchase-order/purchase-order-detail/purchase-order-detail",
-                "pages/purchase-order/purchase-order-selection-goods/purchase-order-selection-goods",
-                "pages/purchase-order/purchase-order-sales/purchase-order-sales",
-                "pages/purchase-return/purchase-return",
-                "pages/purchase-return/add/add",
-                "pages/purchase-return/detail/detail",
-                "pages/purchase-receipt/purchase-receipt",
-                "pages/purchase-receipt/detail/detail",
-                "pages/purchase-based-sales/purchase-based-sales",
-                "pages/purchase-details/purchase-details",
-                "pages/purchase-tracking/purchase-tracking",
-                "pages/supplier-list/supplier-list",
-                "pages/supplier-list/add/add"
-            ]
-        }
+          "root": "package-purchase",
+          "name": "package-purchase",
+          "pages": [
+              "pages/purchase-order/purchase-order",
+              "pages/purchase-order/add/add",
+              "pages/purchase-order/purchase-return-repla-sup/purchase-return-repla-sup",
+              "pages/purchase-order/select-source-sheet/select-source-sheet",
+              "pages/purchase-order/purchase-order-detail/purchase-order-detail",
+              "pages/purchase-order/purchase-order-selection-goods/purchase-order-selection-goods",
+              "pages/purchase-order/purchase-order-sales/purchase-order-sales",
+              "pages/purchase-return/purchase-return",
+              "pages/purchase-return/add/add",
+              "pages/purchase-return/detail/detail",
+              "pages/purchase-receipt/purchase-receipt",
+              "pages/purchase-receipt/detail/detail",
+              "pages/purchase-based-sales/purchase-based-sales",
+              "pages/purchase-details/purchase-details",
+              "pages/purchase-tracking/purchase-tracking",
+              "pages/supplier-list/supplier-list",
+              "pages/supplier-list/add/add"
+          ]
+      }
+        
     ],
     "window": {
         "backgroundTextStyle": "light",

+ 0 - 66
package-basic-data/pages/customer-reception/collection/collection.js

@@ -1,66 +0,0 @@
-// package-basic-data/pages/customer-reception/collection/collection.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

+ 0 - 3
package-basic-data/pages/customer-reception/collection/collection.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

+ 0 - 2
package-basic-data/pages/customer-reception/collection/collection.wxml

@@ -1,2 +0,0 @@
-<!--package-basic-data/pages/customer-reception/collection/collection.wxml-->
-<text>package-basic-data/pages/customer-reception/collection/collection.wxml</text>

+ 0 - 1
package-basic-data/pages/customer-reception/collection/collection.wxss

@@ -1 +0,0 @@
-/* package-basic-data/pages/customer-reception/collection/collection.wxss */

+ 174 - 62
package-purchase/pages/purchase-order/add/add.js

@@ -1,66 +1,178 @@
-// package-purchase/pages/purchase-order/add/add.js
+// package5/pages/purchase-order/add/add.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    activeNames: ['1'],
+    orderType: 'add'
+  },
+  /**
+   * @desc : 折叠面板
+   * @author : 于继渤
+   * @date : 2023/08/16 14:45
+   */
+  onChangeCollapse(e) {
+    this.setData({
+      activeNames: e.detail,
+    });
+  },
+  chooseSaleOrders() {
+    wx.navigateTo({
+      url: '../../purchase-based-sales/purchase-based-sales',
+    })
+  },
+  toChooseGoods(){
+    wx.navigateTo({
+      url: '../../purchase-order/purchase-order-selection-goods/purchase-order-selection-goods',
+    })
+  },
+  /**
+    * @desc : 打开商品
+    * @author : 于继渤
+    * @date : 2022/5/26 12:16
+    */
+  openChoosedItemInfo(e) {
+    let item = e.currentTarget.dataset.item
+    let index = e.currentTarget.dataset.index
+    this.setData({
+      usedLocation: item.usedLocation,
+      ProductIndex: index,
+      currentChoosedItem: item,
+      showEditProduct: true,
+      EditProduct_priceSale_temp: item.itemAmount
+    })
+
+    //非标淋浴房
+    if ((item.flgNonStandardType == 1 || item.flgNonStandardType == 2) || (item.nonGlassList && item.nonGlassList.length > 0)) {
+      // item.nonStandardList = []
+      //加载默认spu非标参数数据
+      let copyItem = util.copyObj(item)
+      this.getFlgNonStandardList(copyItem)
+      this.setData({
+        show7: true
+      })
+
+      //  this.getSkuBySpuId(copyItem.spuId)
+      this.setData({
+        show6: true
+      })
+    } else {
+      this.setData({
+        show6: false,
+        show7: false
+      })
+    }
+    //    this.getSelectStock(item)
+  },
+  /**
+* @desc : 编辑商品关闭编辑备注事件
+* @author : 于继渤
+* @date : 2022/5/26 12:16
+*/
+  closeChoosedItemInfo() {
+    this.setData({
+      showEditProduct: false
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    if (options.orderType == 'edit') {
+      this.setData({
+        orderType: 'edit'
+      })
+      wx.setNavigationBarTitle({
+        title: '编辑暂存采购订单',
+      })
     }
+    this.setData({
+      totallength: 15999,
+      form: {
+        categoryQuantity: 1,
+        sumQuantity: 2,
+        sumAmount: 15999,
+        remarks: '尽快送货',
+        customerForm: {
+          contactPhone: '156 5678 5643',
+          contactName: '王暖暖',
+          address: '北京市朝阳区和平西桥和平西苑20号楼一单元502室',
+          deliveryTime: '2022-05-22'
+        }
+      },
+      entryWh: {
+        entryWhName: '分销运营总仓'
+      },
+      goodsList: [
+        {
+          iconThumPath: 'https://hegii-hap.oss-cn-shenzhen.aliyuncs.com/haip/2022-08-31/95ce630a562b418d8c7b806faa1a6895.jpeg?Expires=1706080258&OSSAccessKeyId=LTAI5tDd2DXPjsSr4ta5fGp3&Signature=3%2F0%2FZkWt0NPaCxmvzC3enCYDWa4%3D',
+          titleTag: '恒洁卫浴',
+          title: 'HE900A 智能',
+          desc: 'HE900A 智能一体机盖板',
+          priceSale: 10000,
+          entryWhName: '分销运营仓',
+          itemQuantity: 1,
+        },
+        {
+          iconThumPath: 'https://hegii-hap.oss-cn-shenzhen.aliyuncs.com/haip/2022-08-31/95ce630a562b418d8c7b806faa1a6895.jpeg?Expires=1706080258&OSSAccessKeyId=LTAI5tDd2DXPjsSr4ta5fGp3&Signature=3%2F0%2FZkWt0NPaCxmvzC3enCYDWa4%3D',
+          titleTag: '恒洁卫浴',
+          title: 'HE900A 智能',
+          desc: 'HE900A 智能一体机盖板',
+          priceSale: 5999,
+          entryWhName: '分销运营仓',
+          itemQuantity: 1,
+        }]
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
 })

+ 2 - 1
package-purchase/pages/purchase-order/add/add.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
+    "usingComponents": {},
+    "navigationBarTitleText": "新建采购订单"
 }

+ 603 - 2
package-purchase/pages/purchase-order/add/add.wxml

@@ -1,2 +1,603 @@
-<!--package-purchase/pages/purchase-order/add/add.wxml-->
-<text>package-purchase/pages/purchase-order/add/add.wxml</text>
+<wxs src='../../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<wxs src='../../../../utils/numberFormat.wxs' module="numberFormat"></wxs>
+<wxs module="txtIndexOf">
+  function toIndexOf(value, value2) {
+    return value.indexOf(value2)
+  }
+</wxs>
+<van-dialog id="van-dialog" />
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<view style="margin-bottom: 15rpx;"></view>
+<view class="dk-card-outer-class">
+  <van-collapse value="{{ activeNames }}" bind:change="onChangeCollapse" custom-class="dk-collapse">
+    <van-collapse-item name="1">
+      <view slot="title" style="display: flex;">
+        <view class="dk-collapse-item" style="width: 30%;">收货信息</view>
+        <view wx:if="{{activeNames.length  == 0}}" style="width: 70%;">{{(form.customerForm.contactName ? form.customerForm.contactName : '') + ( form.customerForm.contactPhone ? '/' +form.customerForm.contactPhone : '')}}</view>
+      </view>
+
+
+      <view catchtap="changeContact">
+        <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="contactPhone" maxlength="50" value="{{ form.customerForm.contactName }}" input-align="right" label="收货人" placeholder="请输入收货人" autosize border="{{ false }}" readonly="{{true}}">
+        </van-field>
+        <!--收货电话-->
+        <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="contactPhone" maxlength="50" value="{{ form.customerForm.contactPhone }}" input-align="right" label="收货电话" placeholder="请输入收货电话" autosize border="{{ false }}" readonly="{{true}}" bind:change="changeCustomerFormField">
+        </van-field>
+        <!--收货地址-->
+        <van-field input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="left" data-key="address" maxlength="1000" type="textarea" value="{{ wxmlUtil.addressToIndexOf(form.customerForm.address) }}" label="收货地址" placeholder="请选择收货地址" autosize border="{{ false }}" color="#95A8CB" data-type='address' readonly="{{true}}">
+        </van-field>
+
+      </view>
+      <van-field input-width="200rpx" input-align="left" label-class="nomal-label" input-class="dk-cell-value-class" value="{{ entryWh.entryWhName ? entryWh.entryWhName: '' }}" is-link border="{{ false }}" label="收货仓库" placeholder="请选择收货仓库" data-key="deliveryTime" catchtap="onClickDelivery" color="#95A8CB" readonly="{{true}}"></van-field>
+
+      <van-field input-width="200rpx" input-align="left" label-class="nomal-label" input-class="dk-cell-value-class" value="{{ form.customerForm.deliveryTime ? wxmlUtil.format(form.customerForm.deliveryTime) : '' }}" is-link border="{{ false }}" label="收货日期" placeholder="请选择收货日期" data-key="deliveryTime" catchtap="onClickDeliveryTime" color="#95A8CB" readonly="{{true}}"></van-field>
+
+
+
+    </van-collapse-item>
+  </van-collapse>
+</view>
+
+
+
+
+<!--选商品-->
+<view>
+  <view style="display:flex;height: 102rpx;margin: 40rpx 34rpx 10px 34rpx;">
+    <view class="choose-goods" bindtap="toChooseGoods">
+      <view class="choose-goods-image">
+        <van-image width="32rpx" height="34rpx" src="/static/img/choose-goods.png" />
+      </view>
+      <view class="choose-goods-text">选商品</view>
+    </view>
+    <view style="width: 22rpx;"></view>
+    <view class="scan-goods" bindtap="chooseSaleOrders">
+      <view class="choose-goods-image">
+        <van-image width="32rpx" height="34rpx" src="/static/img/scan-code.png" />
+      </view>
+      <view class="choose-goods-text">选订单</view>
+    </view>
+  </view>
+</view>
+
+<!--商品明细-->
+<view style="margin: 48rpx 32rpx 10px 32rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="  background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx;">
+    <view class="content-goods-info">商品明细</view>
+    <van-cell wx:if="{{goodsList.length==0}}" border="{{ false }}" style="border-radius: 15rpx;">
+      <van-empty description="暂未选择商品" />
+    </van-cell>
+    <view wx:for="{{goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ false }}">
+      <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" async-close bind:close="onCloseDel">
+        <van-card>
+          <view slot="thumb" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
+            <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+          </view>
+          <view slot="title" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo" style="display: flex;">
+            <view style="display: flex;">
+              <dk-title titleTag="{{item.titleTag}}" title="{{item.title}}"></dk-title>
+            </view>
+            <view wx:if="{{item.skuSpecsFlag }}" style="text-align: right;width: 30%;">
+              <dk-van-tag radius="10rpx" roundFlag="{{true}}" value="需设计" color="red"></dk-van-tag>
+            </view>
+          </view>
+          <view slot="desc" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
+            <view style="display:flex;width: 100%;">
+              <dk-text fontWeight="nomal" value="{{item.desc}}"></dk-text>
+            </view>
+            <view wx:if="{{item.nonGlassListShow}}" style="padding-top: 15rpx; padding-bottom: 15rpx; width: 100%;">
+              <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
+            </view>
+          </view>
+          <view slot="tag" data-item="{{item}}" data-index="{{index}}" catchtap="openChoosedItemInfo">
+            <dk-text fontWeight="nomal" value="{{item.nonGlassListShow}}"></dk-text>
+          </view>
+          <view slot="price">
+            <view style="display: flex;width: 100%;justify-content: center;align-items: center;">
+              <view style="width: 60%;">
+                <dk-cell  contentFontSize="16" height="25rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item.priceSale}}"></dk-cell>
+              </view>
+              <view style="width: 40%;text-align: right;">
+                <van-stepper integer="{{true}}" value="{{item.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeItemQuantity" />
+              </view>
+            </view>
+          </view>
+          <view slot="footer">
+            <view style="margin-top:19rpx;margin-bottom:19rpx;" wx:if="{{item.goodsSkuList.length > 0  || item.combinedList.length > 0}}">
+              <view style="width: 100%;display: flex;font-size:12px;color: #95A8CB;">
+                <view style="width: 50%;text-align: left;">
+                  明细
+                </view>
+                <view style="width: 50%;text-align: right;" data-item="{{item}}" data-index="{{index}}" catchtap="onChangeOpenGoodsList">
+                  {{item.packageDetailsFlag ? '收起' :'展开'}}
+                  <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
+                </view>
+              </view>
+              <!--子件-->
+              <view class="goods-class" wx:if="{{item.packageDetailsFlag}}">
+                <view wx:for="{{item.goodsSkuList}}" data-item="{{item2}}" wx:for-index="index2" wx:for-item="item2" wx:key="index2">
+                  <view class="goods-item-class" wx:if="{{item2.hasChild == 0}}">
+                    <view>
+                      <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item2.iconThumPath}}" />
+                    </view>
+                    <view class="goods-item-tag">
+                      <view style="display: flex;justify-content: space-between;">
+                        <view class="{{((item2.replaceableSku && item2.replaceableSku.length > 0) || item2.cpFlgGift) ?'goods-item-title-replace':''}}">
+                          <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel ? item2.skuModel : item2.skuCode}}"></dk-title>
+                        </view>
+                        <view wx:if="{{item2.replaceableSku && item2.replaceableSku.length > 0}}">
+                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" bind:tap="flag_bindtap" value="替换" color="red"></dk-van-tag>
+                        </view>
+
+                        <view style="padding-left: 3rpx;" wx:if="{{item2.promotionType != 2}}">
+                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="deleteItem" value="删除" color="red"></dk-van-tag>
+                        </view>
+                      </view>
+                      <view style="width: 100%;display: flex;">
+                        <dk-text fontWeight="normal" value="{{item2.skuName}}"></dk-text>
+                      </view>
+
+                      <view style="padding-top: 8rpx; display: flex;">
+                        <view wx:if="{{item2.cpFlgGift}}">
+                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="cpFlgGift_bindtap" value="赠品" color="#1B365D"></dk-van-tag>
+                        </view>
+                        <view wx:if="{{item2.flgAllowSpecsUndefine}}" style="padding-left: 8rpx;">
+                          <dk-van-tag radius="10rpx" roundFlag="{{true}}" dataItem="{{item2}}" dataItemIndex="{{index}}" dataItemIndex2="{{index2}}" bind:tap="flgAllowSpecsUndefine_bindtap" value="坑距" color="#1B365D"></dk-van-tag>
+                        </view>
+                      </view>
+
+                      <!--子级明细价格-->
+                      <view style="display: flex;width: 100%;flex-direction: row;">
+                        <view style="width: 90%;">
+                          <dk-cell   contentFontSize="12" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item2.priceSale}}"></dk-cell>
+                        </view>
+                        <view style="width: 10%">
+                          <dk-text fontWeight="nomal" color="#95A8CB" value="x {{item2.itemQuantity }}"></dk-text>
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+
+            <view style="display: flex;width: 100%;margin-top:5px;align-items: center;" data-index="{{index}}" catchtap="openRemark">
+              <view style="width: 100%;text-align: left;font-size:24rpx;color: #95A8CB;">
+                <van-image width="19rpx" height="20rpx" src="/static/img/remerk-edit.png" />
+                备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : '请输入内容'}}</span>
+              </view>
+            </view>
+            <view class="divide-class"></view>
+          </view>
+        </van-card>
+        <view slot="right">删除</view>
+      </van-swipe-cell>
+    </view>
+
+
+    <!--合计金额-->
+    <view style="display:flex;padding-bottom:20rpx;">
+      <view style="width: 45%;">
+        <view style="padding-left: 30rpx;padding-top: 25rpx;">
+          <text class="dk-cell-title">{{form.categoryQuantity ? form.categoryQuantity : 0}}品类 共计{{form.sumQuantity ? form.sumQuantity : 0}}件</text>
+        </view>
+      </view>
+
+      <view style="width: 55%;">
+        <dk-cell  fontSize="16" fontWeight="bold" contentColor="#CAA977" titleColor="#1B365D;" title="合计金额" content="{{form.sumAmount}}"></dk-cell>
+      </view>
+    </view>
+  </view>
+</view>
+<!-- 其他信息 -->
+<view style="margin: 10px 32rpx 10px 32rpx;margin-top: 41rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 0px 0px 15rpx 15rpx;">
+    <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;">其他信息</view>
+    <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="remarks" maxlength="50" value="{{ form.remarks }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeField">
+    </van-field>
+
+    <view style="display:flex;width:100%;margin: 1vw;padding-top:20rpx;">
+      <view style="width: 30%; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
+      <view style="width: 70%;text-align: left;">
+        <van-uploader max-count="5" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" />
+      </view>
+    </view>
+
+
+    <view style="height: 40rpx;"></view>
+  </view>
+
+
+</view>
+
+<view style="height: 200rpx;"></view>
+
+<!-- 编辑商品 -->
+<van-popup custom-class="dk-popup" show="{{ showEditProduct }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo">
+  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
+  <view class="special-topic">
+    <!-- 图片 -->
+    <view class="special-topic-content">
+      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentChoosedItem.iconThumPath }}"></van-image>
+    </view>
+    <view class="special-topic-title">
+      <!-- 标签 标题-->
+      <dk-title id="titleTagPop" titleTag="{{currentChoosedItem.titleTag}}" title="{{currentChoosedItem.title}}"></dk-title>
+      <view style="padding-top: 10rpx;">
+        <dk-text fontWeight="" value="{{currentChoosedItem.desc}}"> </dk-text>
+      </view>
+      <view style="display: flex;padding-top: 5rpx;">
+        <view wx:if="{{currentChoosedItem.promotionType != 0  }}" class="price-pop-class" style="display: flex;width: 100%;">
+          <view style="width: 90%;">
+            <dk-cell  height="46rpx" spaceWidth="1rpx" left="0" fontSize="12" contentColor="#CAA977" fontWeight="bold" title="批发价:" content="{{currentChoosedItem.pricePromotion}}"></dk-cell>
+          </view>
+        </view>
+        <view wx:else class="price-pop-class">
+          <dk-cell  height="46rpx" spaceWidth="0rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="批发价:" content="{{currentChoosedItem.priceStandard}}"></dk-cell>
+        </view>
+
+        <!-- 可换件 -->
+        <view style="text-align: right; width: 20%;">
+          <van-button style="border-radius: 5rpx;" data-item="{{currentChoosedItem}}" round wx:if="{{currentChoosedItem.replaceFlag}}" catchtap="flag_bindtap" size="mini" color="#E4002B" type="info">可换件</van-button>
+        </view>
+      </view>
+      <!--sku编码-->
+      <view class="selected-sku-text" wx:if="{{currentChoosedItem.skuName}}" style="padding-top: 6rpx !important;">
+        <dk-text catchtap="changeDisplayText" fontWeight="" fontSize="10px" value="已选:{{ currentChoosedItem.displayTextFlag?currentChoosedItem.skuCode:currentChoosedItem.skuName}}"> </dk-text>
+      </view>
+    </view>
+  </view>
+
+  <!--内容-->
+  <view class="pop-content-class">
+    <view style="display: flex;font-size: 28rpx;padding-left: 30rpx;">
+      <view style="color: #95A8CB;width: 40%;">代理商库存</view>
+      <view style="color: #95A8CB; width:30%;text-align: center;">库存量:{{selectStock.inventoryQuantity ? selectStock.inventoryQuantity : 0}}</view>
+      <view style="color: #95A8CB;width:30%;text-align: center;">可售量:{{selectStock.balanceQuantity ? selectStock.balanceQuantity : 0}}</view>
+    </view>
+
+    <van-cell-group border="{{ false }}">
+      <view style="height:calc({{windowHeight+'px'}} - 976rpx);overflow-y: scroll;overflow-x: hidden;">
+        <!-- 非标参数选择 -->
+        <view wx:if="{{ show7}}">
+          <view wx:for="{{currentChoosedItem.nonStandardList}}" wx:key="index" date-item="{{item}}">
+            <view style="width: 30%;">
+              <dk-text wx:if="{{item.isScope == 0}}" fontSize="13px" value="{{item.fieldName}}"></dk-text>
+            </view>
+            <view class="tags" wx:if="{{item.isScope == 0}}">
+              <view class="tag-bom-item" wx:key="indext" wx:for="{{item.options}}" wx:for-index="indext" wx:for-item="itemt">
+                <van-button size="small" catchtap="nonStandardTap" data-pindex="{{index}}" custom-class="{{itemt.infotype=='info'?'button-selected-class':'button-class'}}" data-itemt="{{itemt}}" data-indext="{{indext}}">{{ itemt.name }}
+                </van-button>
+              </view>
+            </view>
+            <view wx:if="{{item.isScope == 1}}" style="display: flex; padding-bottom: 20rpx; padding-top: 10rpx;">
+              <view style="width: 50%;">
+                <dk-text fontSize="13px" value="{{item.fieldName}}"></dk-text>
+              </view>
+              <view style="width: 50%; text-align: right;font-size: 13px; ">
+                <input type="text" placeholder-class="placeholder-class" placeholder="{{'请输入'+item.fieldName}}" data-pindex="{{index}}" data-item="{{item}}" value="{{item.optionName}}" bindblur="bindBlurIsScopeOne" bindinput="bindInputIsScopeOne"></input>
+              </view>
+            </view>
+          </view>
+          <view wx:if="{{currentChoosedItem.flgNonStandardType == 1}}">
+            <view style="display: flex; padding-bottom: 20rpx; padding-top: 10rpx;">
+              <view style="width: 50%;">
+                <dk-text fontSize="13px" value="面积公式"></dk-text>
+              </view>
+              <view style="width: 50%; text-align: right;font-size: 13px; ">
+                <input type="text" placeholder-class="placeholder-class" data-pindex="{{index}}" disabled="{{true}}" data-item="{{item}}" value="{{currentChoosedItem.specialFormulaName}}" bindblur="bindBlurIsScopeOne" bindinput="bindInputIsScopeOne"></input>
+              </view>
+            </view>
+            <van-cell border="{{ false }}" title-width="410rpx" title-class="{{!currentChoosedItem.flgGift ? 'red-label' : ''}}" disabled="{{currentChoosedItem.flgGift}}">
+              <view slot="title">
+                面积
+              </view>
+              <view Cell Slot="value">
+                <dk-number-input sign="" formatThousandth="{{false}}" digits="{{6}}" center="right" data-key="nonStandardArea" inputValue="{{currentChoosedItem.nonStandardArea?currentChoosedItem.nonStandardArea:0}}" bind:triggerBindValue="bindBlurNonStantardArea"></dk-number-input>
+              </view>
+            </van-cell>
+
+          </view>
+        </view>
+
+        <van-cell wx:if="{{orderEdit_type == 2 && !orderEdit_type_apvResult}}" title="数量" title-class="red-label" value="{{currentChoosedItem.itemQuantity}}" border="{{ false }}">
+        </van-cell>
+        <!--数量-->
+        <van-cell wx:if="{{orderEdit_type != 2 || orderEdit_type_apvResult =='1'}}" title="数量" title-class="red-label" border="{{ false }}">
+          <van-stepper integer="{{true}}" value="{{currentChoosedItem.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeChooseItemQuantity" />
+        </van-cell>
+
+        <van-field wx:if="{{currentChoosedItem.flgNonStandardType == 1}}" label-class="nomal-label" input-class="dk-cell-value-pop-class" border="{{ false }}" label="非标备注" maxlength="100" bind:blur="changeStandardPrice1" bind:change="changeCurrentChoosedItemField" data-key="nonstandardRemarks" value="{{currentChoosedItem.nonstandardRemarks}}" input-align="right" placeholder="请输入非标备注" border="{{ false }}" readonly="{{true}}" />
+
+        <van-field input-width="200rpx" input-class="dk-cell-value-pop-class" label-class="nomal-label" input-align="left" data-key="warehouse" maxlength="100" type="text" value="{{ currentChoosedItem.entryWhId_Name ? currentChoosedItem.entryWhId_Name : currentChoosedItem.entryWhName}}" label="收货仓库" placeholder="请选择收货仓库" autosize border="{{ false }}" right-icon="arrow" color="#95A8CB" data-type='warehouse' catchtap="openSingle" readonly="{{true}}">
+        </van-field>
+
+        <view class="tags">
+          <view style="margin-left: 15px;margin-bottom: 10px;" wx:key="indext" wx:for="{{tags}}" wx:for-index="indext" wx:for-item="itemt">
+            <van-button size="mini" catchtap="clicktype" color="#989697" data-pindex="{{index}}" data-itemt="{{itemt}}" data-indext="{{indext}}" plain type="info">{{ itemt.usedLocation }}</van-button>
+          </view>
+        </view>
+        <!--备注-->
+        <van-field label-class="nomal-label" input-class="dk-cell-value-pop-class" label="备注" maxlength="1000" bind:change="changeCurrentChoosedItemField" data-key="remarks" value="{{currentChoosedItem.remarks}}" input-align="right" placeholder="请输入备注" border="{{ false }}" />
+        <!--赠品标识-->
+        <van-cell wx:if="{{currentChoosedItem.cpFlgGift}}" title-class="nomal-label" title="赠品标识" border="{{ false }}" value-class="value-class">
+          <van-checkbox shape="round" value="{{ currentChoosedItem.flgGift}}" data-index="{{index}}" data-key="flgGift" bind:change="changeAllReadyCheckBox" />
+        </van-cell>
+        <view style="height: 100rpx;"></view>
+      </view>
+      <view style="text-align: center;">
+        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentChoosedItem}}" size="small" bindtap="updateToChooseList">确定</van-button>
+      </view>
+    </van-cell-group>
+  </view>
+</van-popup>
+
+
+<!-- 新建 -->
+<dk-save-bottom  wx:if="{{orderType === 'add'}}"  leftButtonFlag="true"  rightButtonFlag="{{true}}"  loading="{{loading}}" flagTypeName="purchase-orders-offer" totallength="{{numberFormat.toThousandCents(totallength)}}" item="{{item}}" bind:allClean="deal" bind:submit="submit"></dk-save-bottom>
+
+<!-- 编辑 -->
+<dk-save-bottom  leftButtonFlag="{{true}}" rightButtonFlag="{{true}}" wx:if="{{orderType === 'edit'}}"  loading="{{loading}}" flagTypeName="purchase-orders-edit1" totallength="{{numberFormat.toThousandCents(totallength)}}" item="{{item}}" bind:allClean="deal" bind:submit="submit"></dk-save-bottom>
+
+
+<!--备注-->
+<van-popup show="{{ remarkFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_remark">
+  <van-cell-group>
+    <van-cell border="{{ false }}">
+      <view style="display: flex;">
+        <view style="width:80%;font-size:16px;color:#34495e;text-align:left;">
+          备注修改
+        </view>
+
+        <view style="text-align: right; width:20%; ">
+        </view>
+      </view>
+    </van-cell>
+    <van-divider />
+
+    <van-field rows="5" autosize label="备注" value="{{goodsList[remarksIndex].remarks}}" type="textarea" maxlength="1000" placeholder="请输入备注" data-item="{{goodsList[remarksIndex].remarks}}" data-key="remarks" input-class="input-class" bind:change="changeRemarksField" border="{{ false }}" />
+
+    <view style="height: 450rpx;"></view>
+
+    <view style="text-align: center;">
+      <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" size="small" bindtap="updateToChooseList_remark">确定</van-button>
+    </view>
+    <view style="height: 40rpx;"></view>
+  </van-cell-group>
+</van-popup>
+
+<!--联系电话-->
+<van-popup show="{{ telephoneFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeCustomerPhonePop">
+  <van-cell-group>
+    <van-cell border="{{ false }}">
+      <view style="display: flex;">
+        <view style="width:80%;font-size:16px;;color:#34495e;text-align:left;">
+          联系电话修改
+        </view>
+        <view style="text-align: right; width:20%; ">
+        </view>
+      </view>
+    </van-cell>
+    <van-divider />
+    <dk-number-phone-input dataKey="customerPhone" value="{{form.customerForm.customerPhone}}" bind:changeField="changeCustomerPhonePop"></dk-number-phone-input>
+    <view style="color:blue;font-size: 14px;padding-left: 30rpx;">注意:仅修改当前客户的联系电话</view>
+    <view style="height: 550rpx;"></view>
+    <view style="text-align: center;">
+      <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" size="small" bindtap="updateCustomerPhone">确定</van-button>
+    </view>
+    <view style="height: 40rpx;"></view>
+  </van-cell-group>
+</van-popup>
+
+<!-- 可换件-->
+<dk-replace-sku model:show="{{replaceShow}}" value="{{replaceObj}}" bind:replace="replaceItem" bind:closePop="replaceItemClose">
+</dk-replace-sku>
+
+<!-- 赠品标价 -->
+<van-popup custom-class="dk-popup" show="{{ cpFlgGiftFlag }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_cpFlgGift">
+  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
+  <view class="special-topic">
+    <!-- 图片 -->
+    <view class="special-topic-content">
+      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentSkuChoosedItem.iconThumPath }}"></van-image>
+    </view>
+    <view class="special-topic-title">
+      <!-- 标签 标题-->
+      <dk-title titleTag="{{currentSkuChoosedItem.titleTag}}" title="{{currentSkuChoosedItem.skuModel}}"></dk-title>
+      <view style="padding-top: 10rpx;">
+        <dk-text fontWeight="normal" value="{{currentSkuChoosedItem.skuName}}"></dk-text>
+      </view>
+      <view style="display: flex;padding-top: 5rpx;">
+        <view wx:if="{{currentSkuChoosedItem.promotionType != 0 || currentSkuChoosedItem.flgNonStandardType == 1}}" class="price-pop-class">
+          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="售价:" content="{{currentSkuChoosedItem.priceSale ?  currentSkuChoosedItem.priceSale: currentSkuChoosedItem.pricePromotion}}"></dk-cell>
+        </view>
+        <view wx:else class="price-pop-class">
+          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标价:" content="{{currentSkuChoosedItem.priceSale ?  currentSkuChoosedItem.priceSale: currentSkuChoosedItem.priceStandard}}"></dk-cell>
+        </view>
+
+        <!-- 赠品 -->
+        <view style="text-align: right; width: 20%;">
+          <van-button style="border-radius: 5rpx;" data-item="{{currentSkuChoosedItem}}" round catchtap="" size="mini" color="#1B365D" type="info">赠品</van-button>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <!--内容-->
+  <view class="pop-content-class">
+    <van-cell-group border="{{ false }}">
+
+      <!--销售价格-->
+      <van-cell border="{{ false }}" title-width="410rpx">
+        <view slot="title">
+          销售价格
+        </view>
+        <view Cell Slot="value">
+          <dk-number-input center="right" data-key="priceSale" inputValue="{{currentSkuChoosedItem.priceSale}}" bind:triggerBindValue="changeSalesPriceField"></dk-number-input>
+        </view>
+      </van-cell>
+      <van-cell border="{{ false }}" title-width="410rpx">
+        <view slot="title">
+          销售金额
+        </view>
+        <view Cell Slot="value">
+          <dk-number-input center="right" data-key="itemAmount" inputValue="{{currentSkuChoosedItem.itemAmount}}" bind:triggerBindValue="changeItemAmountField"></dk-number-input>
+        </view>
+      </van-cell>
+
+      <!--正常品显示-->
+      <van-cell wx:if="{{currentSkuChoosedItem.promotionType==0}}" border="{{ false }}" title-width="410rpx" disabled="{{currentSkuChoosedItem.flgGift}}">
+        <view slot="title" style="color:#95A8CB">
+          标价折扣
+        </view>
+        <dk-text color="#1B365D" fontSize="13px" fontWeight="nomal" value="{{(currentSkuChoosedItem.discountStandard  || currentSkuChoosedItem.discountStandard ==0)?(currentSkuChoosedItem.discountStandard+ '%'):'' }}"></dk-text>
+      </van-cell>
+
+      <!--促销品显示-->
+      <van-cell wx:if="{{currentSkuChoosedItem.promotionType !=0 }}" border="{{ false }}" title-width="410rpx">
+        <view slot="title" style="color:#95A8CB">
+          标准售价折扣
+        </view>
+        <dk-text color="#1B365D" fontSize="13px" fontWeight="nomal" value="{{currentSkuChoosedItem.discountPromotion?(currentSkuChoosedItem.discountPromotion+ '%'):'' }}"></dk-text>
+      </van-cell>
+
+      <!--赠品标识-->
+      <van-cell title-class="nomal-label" title="赠品标识" border="{{ false }}" value-class="value-class">
+        <van-checkbox shape="round" value="{{ currentSkuChoosedItem.flgGift}}" data-index="{{index}}" data-key="flgGift" bind:change="changeSkuFlgGift" />
+      </van-cell>
+      <view style="height: 100rpx;"></view>
+
+      <view style="text-align: center;">
+        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentSkuChoosedItem}}" size="small" bindtap="updateCurrentSkuChoosedItem">确定</van-button>
+      </view>
+    </van-cell-group>
+  </view>
+</van-popup>
+
+<van-popup custom-class="dk-popup" show="{{ flgAllowSpecsUndefineFlag }}" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_flgAllowSpecsUndefine">
+  <view style="position:relative; top:280rpx;z-index:  1;background-color: transparent; height: 44rpx;"></view>
+  <view class="special-topic">
+    <!-- 图片 -->
+    <view class="special-topic-content">
+      <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ currentSkuChoosedItem.iconThumPath }}"></van-image>
+    </view>
+    <view class="special-topic-title">
+      <!-- 标签 标题-->
+      <dk-title titleTag="{{currentSkuChoosedItem.titleTag}}" title="{{currentSkuChoosedItem.skuModel}}"></dk-title>
+      <view style="padding-top: 10rpx;">
+        <dk-text fontWeight="normal" value="{{currentSkuChoosedItem.skuName}}"></dk-text>
+      </view>
+      <view style="display: flex;padding-top: 5rpx;">
+        <view wx:if="{{currentSkuChoosedItem.promotionType == 0}}" class="price-pop-class">
+          <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标价:" content="{{currentSkuChoosedItem.priceStandard}}"></dk-cell>
+        </view>
+        <view wx:if="{{currentSkuChoosedItem.promotionType != 0}}" class="price-pop-class">
+          <dk-cell height="46rpx" left="0" fontSize="14" contentColor="#CAA977" fontWeight="bold" title="标准售价:" content="{{currentSkuChoosedItem.pricePromotion}}"></dk-cell>
+        </view>
+
+        <!-- 赠品 -->
+        <!-- <view style="text-align: right; width: 20%;">
+          <van-button style="border-radius: 5rpx;" data-item="{{currentSkuChoosedItem}}" round catchtap="" size="mini" color="#1B365D" type="info">坑距</van-button>
+        </view> -->
+      </view>
+
+    </view>
+  </view>
+
+  <!--内容-->
+  <view class="pop-content-class">
+    <van-cell-group border="{{ false }}">
+      <!--坑距待定-->
+      <!-- <van-cell title-class="nomal-label" title="坑距待定" border="{{ false }}" value-class="value-class">
+        <van-checkbox shape="round" value="{{ currentSkuChoosedItem.flgSpecsUndefine}}" data-index="{{index}}" data-key="flgGift" bind:change="changeSkuFlgSpecsUndefine" />
+      </van-cell> -->
+      <view style="height: 100rpx;"></view>
+      <view style="text-align: center;">
+        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:640rpx;" type="info" data-item="{{currentSkuChoosedItem}}" size="small" bindtap="updateCurrentSkuChoosedItemFlgSpecsUndefine">确定</van-button>
+      </view>
+    </van-cell-group>
+  </view>
+</van-popup>
+
+<!-- 收货人列表 -->
+<van-popup show="{{ contactFlag }}" style="z-index: 999;" round="{{true}}" position="bottom" bind:close="closeChoosedItemInfo_contact">
+  <view style="padding-top:30rpx;">
+    <scroll-view scroll-y="{{true}}" style="height: 50vh;">
+      <view wx:for="{{contactList}}" data-item="{{item}}" wx:for-index="index" wx:key="index" class="main-class">
+        <view class="main-foot" style="border-radius: 15rpx;">
+          <view style="padding:10rpx;">
+            <view data-index="{{index}}" data-item="{{item}}">
+              <view style="padding:20rpx;" class="table-row-right">
+                <view style="display: flex;">
+                  <view style=" width: 9%;">
+                    <view style="border-radius: 51%; width: 38rpx; height: 38rpx;background-color: #95A8CB;display: flex;align-items: center;justify-content:center;text-align: center;padding:2rpx;">
+                      <van-icon name="/static/img/address_mana.png" custom-style="width:30rpx;height:30rpx; " />
+                    </view>
+                  </view>
+                  <view style="font-weight: bold;display: flex; width: 67%;">
+                    <view style="width: auto;padding-right:30rpx; font-size: 30rpx;text-overflow: ellipsis;  white-space: nowrap;overflow: hidden;color:#1B365D">
+                      {{item.contactName}}
+                    </view>
+                    <view style="width: 50%;">
+                      <dk-text fontSize="30rpx" fontWeight="nomal" value="{{item.contactPhone}}"></dk-text>
+                    </view>
+                  </view>
+                  <view style="width: 24%;display: flex;justify-content: right;align-items: right;margin-left: 4rpx;">
+                    <view style="font-size: 24rpx;width: 70%;text-align: center;">
+                      <view style="border: solid 2rpx #606EB2;border-radius: 12rpx;" wx:if="{{item.flgDefault}}">
+
+                        <view style="padding-top: 2rpx;padding-bottom: 2rpx; padding-right: 12rpx;padding-left:12rpx">
+                          默认
+                        </view>
+                      </view>
+                    </view>
+                    <view style="width: 30%;text-align: center;padding-left:10rpx;" catchtap="edit" data-item="{{item}}">
+                      <van-checkbox value="{{ item.checked }}" data-index="{{index}}" bind:change="consigneeSelection"></van-checkbox>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view style="padding:20rpx;font-weight: bold;" class="table-row-right">
+                <dk-text fontSize="28rpx" fontWeight="nomal" value="{{ item.addressFull }}"></dk-text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view style="height: 100rpx;"></view>
+    </scroll-view>
+  </view>
+
+
+  <view style="padding:20rpx;">
+    <view style="display: flex;">
+      <view style="width: 40%;">
+        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="contactAdd" type="default">新建
+        </van-button>
+
+      </view>
+      <view style="width: 60%;text-align: right;">
+        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;width:380rpx;" type="info" size="large" bindtap="contactUpdate">确定</van-button>
+      </view>
+    </view>
+    <view style="height: 20rpx;"></view>
+  </view>
+
+
+</van-popup>
+
+<!-- 收货日期 -->
+<van-popup show="{{ deliveryFlag }}" data-key="deliveryTime" position="bottom" bind:close="onConfirmChooseDateClose" bind:click-overlay="onConfirmChooseDateClose">
+  <view style="display:flex;justify-content: space-around;height:80rpx;">
+    <view style="width:45%;text-align: left;color:#b6b6b6;line-height:80rpx;" data-key="deliveryTime" catchtap="onConfirmChooseDateClose">取消</view>
+    <view style="width:45%;text-align: right;color:#1989fa;line-height:80rpx;" data-key="deliveryTime" catchtap="onConfirmChooseDate">确定</view>
+  </view>
+  <van-datetime-picker show-toolbar="{{false}}" data-key="deliveryTime" bindonlyinput="changeDate" data-index="0" type="date" loading="{true}" value="{{ deliveryTimeDefaultSearch }}" />
+</van-popup>
+
+<!-- 库区 -->
+<dk-single-dropdown-item model:show="{{warehouseFlag}}" contentID="{{currentChoosedItem.whId}}" orgId="{{orgMain.organizationId}}" id='warehouse' typeName='warehouse' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
+
+
+
+<dk-single-dropdown-item model:show="{{warehouseTotalFlag}}" contentID="{{entryWh.entryWhId}}" id='warehouseTotal' typeName='warehouseTotal' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>

+ 468 - 1
package-purchase/pages/purchase-order/add/add.wxss

@@ -1 +1,468 @@
-/* package-purchase/pages/purchase-order/add/add.wxss */
+page {
+  background: #F5F5F5;
+}
+
+.tab-h {
+  height: 75rpx;
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  line-height: 75rpx;
+  background: #F7F7F7;
+  font-size: 30rpx;
+  white-space: nowrap;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  background-color: white !important;
+}
+
+.tab-item {
+  margin: 0 27rpx;
+  display: inline-block;
+  font-size: 25rpx;
+}
+
+.tab-item.active {
+  color: #1989FA;
+  position: relative;
+}
+
+.tab-item.active:after {
+  content: "";
+  display: block;
+  height: 8rpx;
+  width: 88rpx;
+  background: #1989FA;
+  position: absolute;
+  bottom: 0;
+  left: 5rpx;
+  border-radius: 16rpx;
+}
+
+.page-group {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  position: relative;
+  top: 0;
+  left: 0;
+  z-index: 999;
+
+  /*这个设置在原生组件中用于置顶导航条*/
+}
+
+.hiddenmore .more-item {
+  display: none;
+}
+
+.showmore .more-item {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: flex;
+}
+
+.flex-class {
+  display: flex;
+  justify-content: space-around;
+}
+
+.hr {
+  width: 100%;
+  height: 3rpx;
+  margin-top: 15rpx;
+  /* margin-left: 37.5rpx; */
+  background-color: #dfdedd;
+}
+
+.value-class {
+  flex: none !important;
+}
+
+.right-field-css {
+  text-align: right !important;
+}
+
+.add-btn {
+  margin-top: 10rpx;
+}
+
+.list-msg {
+  padding: 0 20rpx;
+  background-color: #fff;
+  position: relative;
+}
+
+.list-msg1 {
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.list-msg .list-msg2 {
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border: 1px solid #ccc;
+  padding: 0 10rpx;
+}
+
+.select_box {
+  background-color: #eee;
+  padding: 0 10rpx;
+  width: 93%;
+  position: absolute;
+  top: 130rpx;
+  z-index: 1;
+  overflow: hidden;
+  animation: myfirst 0.5s;
+}
+
+@keyframes myfirst {
+  from {
+    height: 0rpx;
+  }
+
+  to {
+    height: 210rpx;
+  }
+}
+
+.select_one {
+  height: 60rpx;
+  line-height: 60rpx;
+  border-bottom: 1px solid #ccc;
+}
+
+/**客户信息**/
+.content-customer-info{
+  padding: 20rpx 32rpx 20rpx 32rpx;
+  color: #1B365D;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/**客户信息**/
+.content-goods-info{
+  padding: 10px 32rpx 10px 32rpx;
+  color: #1B365D;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/**分割线*/
+.divide-class{
+  margin-top:19rpx;
+  width: 617rpx;
+  border: 1rpx solid #E9F0FE;
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+  z-index: 1;
+}
+
+
+.right-field-css {
+  color: black;
+}
+
+/* .van-cell__title {
+  color: #646566;
+} */
+
+
+/**收缩样式*/
+.expand-class{
+  border-radius: 15rpx;
+  text-align: center;
+  padding-top:23rpx;
+  padding-bottom: 23rpx; 
+  color: #95A8CB;
+  background-color: #FFFFFF;
+  font-size: 12px;
+}
+
+/**选择商品*/
+.choose-goods{
+  text-align: center; 
+  display: flex; 
+  justify-content: center; 
+  align-items: center;width: 330rpx;
+  box-shadow: 0px 13px 10px rgba(68, 85, 166, 0.15);
+  border-radius: 15rpx; 
+  background-color: #00A7B5;
+}
+
+/**选择商品图标*/
+.choose-goods-image{
+  width:31.96rpx;
+  height:33.93rpx; 
+  padding-right: 29rpx;
+}
+
+/**选择商品文字*/
+.choose-goods-text{
+  color: #FFFFFF;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/**扫码*/
+.scan-goods{
+  text-align: center; 
+  display: flex; 
+  justify-content: center; 
+  align-items: center;
+  width: 330rpx;
+  box-shadow: 0px 13px 10px rgba(68, 85, 166, 0.15);
+  border-radius: 15rpx; 
+  background-color: #606EB2;
+}
+
+.tags {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: stretch;
+  width: 100%;
+  flex-direction: row; 
+  justify-content: flex-start;
+  background: white; 
+  align-items: center;
+  margin-bottom: 5rpx;
+  margin-top: 10rpx;
+}
+
+.designGraphics-class {
+  text-align: right !important;
+  padding-left: 185rpx;
+}
+
+
+.cell-value-staff-org {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: center;
+  color: #1B365D !important;
+  font-size: 13px !important;
+  font-weight: bold !important;
+}
+
+.input {
+  text-align: left !important;
+  font-size: 26rpx !important;
+  color: #1B365D !important;
+}
+
+/**非必输项label*/
+.dk-cell-title {
+  color: #95A8CB !important;
+  font-size: 14px !important;
+}
+
+.dk-cell-value {
+  color: #CAA977 !important;
+  font-size: 26rpx;
+}
+
+.van-card {
+  background-color: #FFFFFF !important;
+}
+
+.van-card__content{
+  justify-content: space-around !important;
+}
+
+
+
+/**产品明细的样式**/
+.goods-class{
+  width: 100% !important;
+  background: #FBF6EF !important;
+  border-radius: 15rpx !important;
+  padding: 10rpx;
+}
+
+/**产品条目的样式**/
+.goods-item-class{
+  text-align: left;
+  background: #FFFFFF;
+  border: 2rpx solid #606EB2;
+  border-radius: 15rpx;
+  margin: 10rpx 10rpx 20rpx 10rpx !important;
+  display: flex;
+}
+
+.goods-item-image{
+  width: 116rpx;
+  height: 116rpx;
+  left: 16rpx;
+  top: calc((100% - 116rpx)/2);
+}
+
+/**包含替换品时的样式*/
+.goods-item-title-replace{
+  width: 85%;
+}
+
+/**子件标题tag样式*/
+.goods-item-tag{
+  margin: 10rpx 10rpx 10rpx 26rpx;
+  width: 100%;
+}
+
+.price-pop-class{
+  width: 75%;
+}
+
+.label-bule{
+  color: #95A8CB  ;
+  font-size: 14px ;
+}
+
+.placeholder-class{
+  color: #95A8CB;
+}
+
+.button-class{
+  height: 85rpx !important;
+  background: #F8F9FD !important;
+  color: #95A8CB !important;
+  border: 2rpx solid #95A8CB;
+  border-radius: 10rpx !important;
+  text-align: left !important;
+  margin-bottom: 10rpx;
+  z-index: 999 !important;
+}
+
+.button-selected-class{
+  height: 85rpx !important;
+  background: #606EB2 !important;
+  color: #fff !important;
+  border: 2rpx solid #606EB2;
+  border-radius: 10rpx !important;
+  text-align: left !important;
+  margin-bottom: 10rpx;
+  z-index: 999 !important;
+  /* overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  white-space: nowrap !important; */
+}
+.tag-text{
+  overflow: hidden !important;
+  text-overflow: ellipsis !important;
+  white-space: nowrap;
+  word-wrap: break-all;
+  width: 100%;
+  height: 44rpx;
+  margin-top: -10rpx;
+  margin-bottom: -10rpx;
+}
+
+.tag-bom-item{
+  padding-right: 20rpx;
+  flex-direction: column;
+}
+
+
+
+
+
+
+
+
+
+.contents{
+  width:100%;
+  min-height: 100%;
+  
+}
+.touch-item {
+  height: 130rpx;
+  width: 100%;
+  background: #fff;
+  border-bottom: 1rpx solid #eee;
+  display: flex;
+  /* //均匀排布每个元素 */
+  justify-content: space-between;
+  width: 100%;
+  overflow: hidden;
+}
+.content {
+ width: 100%;
+ padding: 0 30rpx;
+ /* margin-right:0; */
+ -webkit-transition: all 0.4s;
+ transition: all 0.4s;
+ -webkit-transform: translateX(150rpx);
+ transform: translateX(150rpx);
+ margin-left: -150rpx;
+ box-sizing: border-box;
+}
+.del {
+  width: 150rpx;  
+  height: 100%;  
+  background-color: red; 
+  color: white; 
+  display: flex;  
+  justify-content: center;  
+  align-items: center;  
+  -webkit-transform: translateX(90px);
+  transform: translateX(90px);
+  -webkit-transition: all 0.4s;
+  transition: all 0.4s;
+}
+.content_name{
+  font-size: 28rpx;
+  color: #333;
+  line-height: 30rpx;
+  margin: 30rpx 0 28rpx;
+}
+.content_time{
+  color: rgb(153,153,153);
+  font-size: 20rpx;
+  line-height: 20rpx;
+}
+.touch-move-active .content,
+.touch-move-active .del {
+ -webkit-transform: translateX(0);
+ transform: translateX(0);
+}
+.input-class {
+  text-align: left !important;
+  height: 100px !important;
+  color: #95A8CB !important;
+  font-size: 12px !important;
+}
+.van-collapse-item__content{
+  padding:10rpx !important;
+  padding-bottom: 20rpx !important;
+  border-radius: 0rpx 0rpx 15rpx 15rpx !important;
+}
+.dk-collapse{
+  padding:10rpx !important;
+  background-color: white !important;
+  border-radius:15rpx !important;
+  color:#1B365D !important;
+  font-size: 32rpx !important;
+}
+.dk-collapse-item{
+
+  color:#1B365D !important;
+  font-size: 32rpx !important;
+  font-weight: bold;
+}
+.save-button-class-canl{
+  width: 196rpx;
+  background: #ffffff !important;
+  /* border-radius: 15rpx !important; */
+  color:#1B365D !important;
+  border: solid 2rpx #1B365D !important;
+  font-size: 16px !important;
+  font-weight: bold !important;
+}
+/* .dk-popup{
+  height: 60%;
+} */

+ 188 - 62
package-purchase/pages/purchase-order/purchase-order.js

@@ -1,66 +1,192 @@
-// package-purchase/pages/purchase-order/purchase-order.js
+// package5/pages/purchase-order/purchase-order.js
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    tableData: [],
+    active: 0,
+    selectTotallength: 12,
+    selectlength: 5,
+    totallength: 234999,
+    createTimeType: {
+      text: '本月',
+      value: 3
     },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
+    statusItem: { text: '审批状态', value: -1 },
+  },
+
+  toDetail(e) {
+    let item = e.currentTarget.dataset.item
+    if(item.displayStatus == '暂存'){
+      wx.navigateTo({
+        url: './add/add?orderType=edit',
+      })
+    }else{
+      wx.navigateTo({
+        url: './purchase-order-detail/purchase-order-detail',
+      })
+    }   
+    console.log(e)
+  },
+  /**
+  * @desc : 列表右上角三个点关闭触发事件
+  * @author : 于继渤
+  * @date : 2022/5/28 08:50
+  */
+ onCloseShare() {
+  this.setData({
+    showShare: false
+  })
+},
+  toAdd(){
+    wx.navigateTo({
+      url: './add/add',
+    })
+  },
+  toReturnAndExchange(){
+    wx.navigateTo({
+      url: './purchase-return-repla-sup/purchase-return-repla-sup',
+    })
+  },
+ /**
+  * @desc : 列表右上角三个点触发事件
+  * @author : 于继渤
+  * @date : 2022/5/28 08:50
+  */
+ onclik(e) {
+
+  let item = e.currentTarget.dataset.item;
+  
+  this.setData({
+
+    showShare: true
+  })
+},
+
+ // 采购退货
+ toPurchaseReturns(e) {
+  // if(e.currentTarget.dataset.item.displayStatus != "入库完成" ){
+  //   wx.showToast({
+  //     title: '不允许进行采购退货',
+  //     icon: 'none'
+  //   })
+  //   return
+  // }
+  wx.navigateTo({
+    // url: '../purchase-return/?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
+    url: './select-source-sheet/select-source-sheet',
+  })
+},
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData({
+      tableData: [
+        {
+          supplierName: '佛山恒洁-顺德加盟商',
+          orderNo: 'FQ202207061423001',
+          displayStatus: '暂存',
+          makingTime: '2022-06-12',
+          deliveryTime: '2022-08-08',
+          contactName: '张暖暖',
+          contactPhones: '156 5678 5643',
+          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
+          categoryQuantity: 1,
+          tsumQuantity: 2,
+          sumAmount: 9999
+        },
+        {
+          supplierName: '佛山恒洁-顺德加盟商',
+          orderNo: 'FQ202207061423001',
+          displayStatus: '出库中',
+          makingTime: '2022-06-12',
+          deliveryTime: '2022-08-08',
+          contactName: '张暖暖',
+          contactPhones: '156 5678 5643',
+          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
+          categoryQuantity: 1,
+          tsumQuantity: 2,
+          sumAmount: 9999
+        },
+        {
+          supplierName: '佛山恒洁-顺德加盟商',
+          orderNo: 'FQ202207061423001',
+          displayStatus: '待入库',
+          makingTime: '2022-06-12',
+          deliveryTime: '2022-08-08',
+          contactName: '张暖暖',
+          contactPhones: '156 5678 5643',
+          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
+          categoryQuantity: 1,
+          tsumQuantity: 2,
+          sumAmount: 9999
+        },
+        {
+          supplierName: '佛山恒洁-顺德加盟商',
+          orderNo: 'FQ202207061423001',
+          displayStatus: '已入库',
+          makingTime: '2022-06-12',
+          deliveryTime: '2022-08-08',
+          contactName: '张暖暖',
+          contactPhones: '156 5678 5643',
+          addressFull: '北京市朝阳区和平西桥和平西苑20号楼B栋-603',
+          categoryQuantity: 1,
+          tsumQuantity: 2,
+          sumAmount: 9999
+        }
+      ]
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
 })

+ 251 - 2
package-purchase/pages/purchase-order/purchase-order.wxml

@@ -1,2 +1,251 @@
-<!--package-purchase/pages/purchase-order/purchase-order.wxml-->
-<text>package-purchase/pages/purchase-order/purchase-order.wxml</text>
+<van-sticky scroll-top="0">
+  <van-search model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" placeholder="输入收货人/地址/电话/商品名称/商品编码/唯一编码/备注"> </van-search>
+  <van-dropdown-menu active-color="#1B365D">
+    <!-- 创建时间 -->
+    <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
+      <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
+    </van-dropdown-item>
+    <!-- 状态 -->
+    <van-dropdown-item id="statusItem" title="{{ statusItem.text }}">
+      <dk-dropdown-switch dataList="{{statusList}}" bind:commit='dropdowncommit'></dk-dropdown-switch>
+    </van-dropdown-item>
+    <!-- 筛选 -->
+    <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
+
+  </van-dropdown-menu>
+  <van-tabs color="#1989FD" nav-class="van-tabs-class" active="{{ active }}" bind:change="onChangeTabs" color="#DEC9A3;" title-active-color="#1B365D" title-inactive-color=" #96A7C5;">
+    <van-tab title="全部单据">
+    </van-tab>
+    <van-tab title="暂存">
+    </van-tab>
+    <van-tab title="成交">
+    </van-tab>
+  </van-tabs>
+</van-sticky>
+
+
+<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+
+<view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class">
+  <!-- 列表上半部分 -->
+  <view class="main-foot" style="position: relative;border-radius: 15rpx;">
+
+    <view class="table-content" bind:tap="toDetail" data-item="{{item}}">
+      <view class="table-content-row">
+        <view class="order-and-status">
+          <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;margin-top: 5rpx;">
+            <view style="width: 39rpx; height: 39rpx;text-align: center;">
+              <van-image round width="28rpx" height="28rpx" src="/static/img/purchase-order-icon.png" />
+            </view>
+          </view>
+          <!-- 供应商 -->
+          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
+            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item.supplierName ? item.supplierName : ''}}"></dk-text>
+          </view>
+
+
+          <!-- 状态 -->
+          <view style="width: calc(20%); height: 49rpx;padding-right:0rpx;" data-item="{{item}}" >
+            <view style="{{item.displayStatus == '暂存'  ?  'height: 49rpx;border-radius: 6rpx;background-color: #E4002B;text-align: center;' : 'height: 49rpx;border-radius: 6rpx;background-color: #77C5D5;text-align: center;'}}">
+              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.displayStatus }}</text>
+            </view>
+          </view>
+          <!-- 三个小点 -->
+          <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
+            <van-icon size="25" name="ellipsis" color="#1B365D" />
+          </view>
+        </view>
+      </view>
+
+      <!-- 日期 -->
+      <view style="display: flex; width: 100%;text-align: right;height: 47rpx">
+        <view style="width:  calc(100% - 210rpx);text-align: left;padding-left: 30rpx;">
+          <!-- {{item.erpPushStatus}} -->
+          <view wx:if="{{item.erpPushStatus == 3}}">
+            <dk-van-tag catchtap="toOrderStatusApvResult" data-item="{{item}}" color="red" roundFlag="{{true}}" size="medium" value="推送异常"></dk-van-tag>
+          </view>
+        </view>
+        <view style="height: 47rpx;background-color: #EAF1FF;border-radius: 0px 0px 0px 30px;width: 210rpx;text-align: center;">
+          <text style="font-size: 14px;color: #808080;">{{item.makingTime}}</text>
+        </view>
+      </view>
+
+      <!-- 订单单号 -->
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="订单编号" copyValue="{{item.orderNo}}"></dk-text>
+          </view>
+          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
+            {{item.orderNo}}
+          </view>
+        </view>
+      </view>
+      <!-- 收货信息 -->
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货信息"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.contactName ? item.contactName : ''}} | {{item.contactPhones ? item.contactPhones : ''}}
+          </view>
+        </view>
+      </view>
+
+
+
+
+      <!-- 收货地址 -->
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收货地址" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+ 
+            {{ item.addressFull}}
+          </view>
+        </view>
+      </view>
+
+      <!-- 预计收货日期 -->
+      <view class="table-content-row">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="预计收货日期"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{item.deliveryTime}}
+          </view>
+        </view>
+      </view>
+
+      <!--分割线-->
+      <view style="padding-left:32rpx;padding-right:32rpx;">
+        <view style="border: 1rpx solid #E9F0FE;height: 0px;"></view>
+      </view>
+
+      <view style="padding: 20rpx 32rpx 20rpx 32rpx;border-radius: 16rpx;">
+        <view style="display: flex;">
+          <view class="category-class">
+            {{item.categoryQuantity + '品类 共'+ item.tsumQuantity+'件'}}
+          </view>
+          <view class="totalamount-class">
+            <dk-cell  fontSize="15" contentFontSize="17" contentColor="#CAA977" titleColor="#1B365D;" contentFontWeight="bold" title="共计金额" content="{{item.sumAmount}}"></dk-cell>
+           
+          </view>
+        </view>
+      </view>
+
+
+    </view>
+  </view>
+</view>
+
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+<view style="height: 220rpx;"></view>
+
+<!-- 卡片右上角 -->
+<van-popup show="{{showShare}}" position="bottom" bind:close="onCloseShare" custom-class="function-pop-class">
+  <van-cell-group border="{{false}}" custom-class="function-cell-group">
+    <van-grid square border="{{false}}" icon-size="42px">
+
+      <!--采购作废-->
+      <van-grid-item wx:if="{{bottomItem.orderStatus === '订单状态-暂存'}}" use-slot catchtap="toAbolitionPurchases" data-item="{{bottomItem}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-orders-follow.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="采购作废"></dk-text>
+        </view>
+      </van-grid-item>
+      <!-- 退换补单 -->
+      <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toReturnAndExchange" data-item="{{bottomItem}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/follow.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="退换补单"></dk-text>
+        </view>
+      </van-grid-item>
+
+      <!--采购退货-->
+      <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toPurchaseReturns" data-item="{{bottomItem}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/return.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="采购退货"></dk-text>
+        </view>
+      </van-grid-item>
+
+
+
+
+
+      <!--采购退货冲正-->
+      <!-- <van-grid-item wx:if="{{bottomItem.orderStatus !== '订单状态-暂存'}}" use-slot catchtap="toPurchaseReturnReversal" data-item="{{bottomItem}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/reverse-purchase-order.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="采购退货冲正"></dk-text>
+        </view>
+      </van-grid-item> -->
+
+
+
+      <!-- 冲正重开 -->
+      <van-grid-item wx:if="{{bottomItem.displayStatus == '成交'}}" use-slot catchtap="toReinstated" data-item="{{bottomItem}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/reverse.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="冲正重开"></dk-text>
+        </view>
+      </van-grid-item>
+
+      <!-- 订单推送 -->
+      <van-grid-item use-slot catchtap="toSync" data-item="{{bottomItem}}" wx:if="{{bottomItem.displayStatus !== '暂存'}}">
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-orders-push.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="订单推送"></dk-text>
+        </view>
+      </van-grid-item>
+    <!--订单打印-->
+    <van-grid-item use-slot catchtap="toOrderPrint" data-item="{{bottomItem}}" 
+  >
+        <view>
+          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-order-print.png"></van-image>
+        </view>
+        <view style="margin-top: -18rpx;">
+          <dk-text fontSize="12px" fontWeight="400" value="订单打印"></dk-text>
+        </view>
+      </van-grid-item>
+
+
+
+
+
+
+
+
+
+
+    </van-grid>
+
+
+
+
+  </van-cell-group>
+  <view class="popup-button">
+    <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onCloseShare">取消
+    </van-button>
+  </view>
+</van-popup>
+
+<!-- 新建按钮 -->
+<dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="order-add" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />

+ 394 - 1
package-purchase/pages/purchase-order/purchase-order.wxss

@@ -1 +1,394 @@
-/* package-purchase/pages/purchase-order/purchase-order.wxss */
+page {
+  background: #F5F5F5;
+}
+
+.list {
+  width: calc(100%-20rpx);
+  padding: 20rpx;
+}
+
+.van-cell__value {
+  width: 72% !important;
+  text-align: left !important;
+  -webkit-flex: auto !important;
+  flex: auto !important;
+}
+
+.van-cell__title {
+  width: 28% !important;
+  -webkit-flex: auto !important;
+  flex: auto !important;
+  color: #6f7071 !important;
+}
+
+.date-and-amount {
+  margin-top: 7rpx;
+  display: flex;
+  width: 100%;
+  justify-content: space-around;
+}
+
+.daa-date {
+  width: 45%;
+  margin-top: 7rpx;
+  font-size: 3.5vw;
+  color: #808080;
+  line-height: 60rpx;
+  text-align: right;
+}
+
+.order-and-status {
+  display: flex;
+  width: 100%;
+  justify-content: space-around;
+}
+
+.order-and-status-sales{
+  display: flex;
+  margin-left: 70rpx;
+  width: calc(100% - 70rpx);
+  justify-content: space-around;
+}
+
+.oas-no {
+  width: 50%;
+  font-size: 3.8vw;
+  color: #3b3b3b;
+  text-align: left;
+}
+
+.oas-status {
+  width: 30%;
+  font-size: 3.5vw;
+  color: #1989fa;
+  text-align: right;
+
+}
+
+.daa-amount {
+  margin-top: 7rpx;
+  width: 75%;
+  font-size: 4vw;
+  color: #e97e04;
+  text-align: right;
+  line-height: 60rpx;
+}
+
+.daa-amount-cun {
+  margin-top: 7rpx;
+  width: 40%;
+  font-size: 4vw;
+  color: #1989FA;
+  text-align: right;
+  line-height: 60rpx;
+}
+
+.horizontal-bar {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.customer-name {
+  width: 80% !important;
+  font-size: 3.5vw;
+  line-height: 50rpx;
+  margin-top: 7rpx;
+  color: #323233;
+}
+
+.btn-to-cun {
+  margin-top: 7rpx;
+  width: 50%;
+  text-align: right;
+}
+
+
+.van-picker__toolbar {
+  display: none !important;
+}
+
+/*新加的弹窗样式*/
+.van-field__label {
+  color: #6f7071 !important;
+}
+
+.van-field__input {
+  color: #6f7071 !important;
+}
+
+.pop-search-view {
+  float: right;
+  margin-right: 20rpx;
+  color: #ffffff;
+  font-size: 44rpx;
+}
+
+.pop-search-item-content {
+  padding: 0 3% 0 3%;
+}
+
+.pop-search-item-content-button {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+
+.pop-search-item-content-button-custom {
+  border: 0 !important;
+  margin: 0 !important;
+  color: #CC3333;
+  background-color: white;
+}
+
+.pop-search-item-content-button-custom::after {
+  border: 1rpx solid #CC3333 !important;
+  background: transparent !important;
+}
+
+.pop-search-item-content-button-custom-gray {
+  border: 0 !important;
+  margin: 0 !important;
+  color: #c1c1c1;
+  background-color: white;
+}
+
+.pop-search-item-content-button-custom-gray::after {
+  border: 1rpx solid #c1c1c1 !important;
+  background: transparent !important;
+}
+
+.scroll {
+  height: calc(100%);
+}
+
+.table-row-custom {
+  display: flex;
+  width: 100%;
+  flex-direction: row;
+  margin-top: 1px;
+
+}
+
+.cn-a-b {
+  display: flex;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.customer-name {
+  width: 50%;
+  font-size: 4vw;
+  line-height: 50rpx;
+  color: #323233;
+  word-break: break-all;
+}
+
+.customer-name2 {
+  width: 100%;
+  font-size: 4vw;
+  line-height: 50rpx;
+  color: #323233;
+  word-break: break-all;
+}
+
+.btn-to-cun {
+  display: inline;
+  width: 100%;
+  text-align: right;
+
+}
+
+.telephone {
+  display: flex;
+  margin-top: 7rpx;
+  font-size: 3.5vw;
+  line-height: 50rpx;
+  color: #323233;
+  width: 55%;
+
+}
+
+.category {
+  display: flex;
+  margin-top: 7rpx;
+  font-size: 3.5vw;
+  line-height: 50rpx;
+  color: #323233;
+  width: 45%;
+}
+
+.address {
+  margin-top: 7rpx;
+  word-break: break-all;
+  white-space: pre-wrap;
+  font-size: 3.5vw;
+  line-height: 50rpx;
+  color: #323233;
+  width: 89%;
+}
+
+.staffname {
+  margin-top: 7rpx;
+  font-size: 3.5vw;
+  line-height: 50rpx;
+  color: #323233;
+  width: 100%;
+  text-align: right;
+}
+
+.address-staffname {
+  display: flex;
+  margin-top: 7rpx;
+  width: 100%;
+}
+
+.image-small {
+  color: #b3b3b3;
+  font-size: 14px;
+}
+
+.hr {
+  width: 100%;
+  height: 2rpx;
+  margin-top: 15rpx;
+  margin-bottom: 15rpx;
+  /* margin-left: 37.5rpx; */
+  background-color: var(--divider-text-color, #e0e1e2);
+}
+
+
+
+
+
+
+
+
+.oas-title-value {
+  width: 80rpx;
+  font-size: 5px;
+  text-align: right;
+  padding-left: 5rpx;
+  color: #1989fa;
+}
+
+
+.value-class {
+  text-align: right !important;
+  font-size: 26rpx !important;
+}
+
+.title-class .van-field__label{
+  font-size: 14px;
+  color:#2E3853 !important;
+  font-weight: 500;
+}
+
+.oas-status-two {
+  width: 40%;
+  font-size: 3.8vw;
+  color: #1989fa;
+  text-align: center;
+}
+
+.time-value-class {
+  color: #1B365D !important;
+  font-weight: 400;
+}
+
+
+
+/* 字体设置 */
+.font-setting {
+  font-size: 3.9vw;
+}
+.bottom-bar{
+  border-radius: 15px;
+  display: flex;
+}
+
+
+
+
+/* 2022/07/25 样式引用*/
+
+
+.van-tabs__scroll{
+  background-color: #F5F5F5 !important;
+}
+
+.van-dropdown-menu__title{
+  color: #1B365D !important;
+}
+
+.van-tabs-class{
+  background: #fff !important;
+}
+
+.dk-font{
+  font-size: 13px;
+  color: #1B365D;
+  font-weight: bold;
+}
+
+/**品类*/
+.category-class{
+  width: 40%;
+  font-size: 15px;
+  color: #95A8CB;
+  align-items: center;
+  display: flex;
+}
+/**合计金额*/
+.totalamount-class{
+  width: 60%;
+  text-align: right !important;
+}
+.modal-app {
+  width: 80%;
+  border-radius: 15rpx;
+}
+
+.modal-button {
+  width: 50%;
+}
+.button-pop-cell-class{
+  border-radius: 15rpx !important;
+}
+
+.button-pop-class{
+  width: 640rpx !important;
+  height: 88rpx !important;
+  background: #1B365D !important;
+  border-radius: 15rpx !important;
+  border: none !important;
+}
+
+.input-class{
+  text-align: left !important;
+  height: 70px !important;
+  color: #1B365D !important;
+}
+.corner-view {
+  position: absolute;
+  /* 扇形弧度 */
+  border-radius: 0 0 100rpx 0; 
+  /* 左上弧度 */
+  border-top-left-radius: 15rpx;
+  /* 位置 */
+  top: 0;
+  left: 0;
+  padding: 14rpx;
+  width: 70rpx;
+  height: 56rpx;
+  background-color: #E3DCD1; 
+
+}
+.corner-view-text{
+  transform: rotate(-45deg);
+    /* 字体颜色 */
+    color: #B19264;
+    font-size: 24rpx;
+    font-weight: 600;
+    font-size: 26rpx;
+}

+ 0 - 66
package-sales/pages/detail/detail.js

@@ -1,66 +0,0 @@
-// package-sales/pages/detail/detail.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

+ 0 - 3
package-sales/pages/detail/detail.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

+ 0 - 2
package-sales/pages/detail/detail.wxml

@@ -1,2 +0,0 @@
-<!--package-sales/pages/detail/detail.wxml-->
-<text>package-sales/pages/detail/detail.wxml</text>

+ 0 - 1
package-sales/pages/detail/detail.wxss

@@ -1 +0,0 @@
-/* package-sales/pages/detail/detail.wxss */

+ 0 - 66
package-sales/pages/order-billing/collection/collection.js

@@ -1,66 +0,0 @@
-// package-sales/pages/order-billing/Collection/Collection.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

+ 0 - 3
package-sales/pages/order-billing/collection/collection.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

+ 0 - 2
package-sales/pages/order-billing/collection/collection.wxml

@@ -1,2 +0,0 @@
-<!--package-sales/pages/order-billing/Collection/Collection.wxml-->
-<text>package-sales/pages/order-billing/Collection/Collection.wxml</text>

+ 0 - 1
package-sales/pages/order-billing/collection/collection.wxss

@@ -1 +0,0 @@
-/* package-sales/pages/order-billing/Collection/Collection.wxss */

+ 0 - 66
package-sales/pages/order-billing/deal/deal.js

@@ -1,66 +0,0 @@
-// package-sales/pages/order-billing/deal/deal.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

+ 0 - 3
package-sales/pages/order-billing/deal/deal.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

+ 0 - 2
package-sales/pages/order-billing/deal/deal.wxml

@@ -1,2 +0,0 @@
-<!--package-sales/pages/order-billing/deal/deal.wxml-->
-<text>package-sales/pages/order-billing/deal/deal.wxml</text>

+ 0 - 1
package-sales/pages/order-billing/deal/deal.wxss

@@ -1 +0,0 @@
-/* package-sales/pages/order-billing/deal/deal.wxss */

+ 11 - 7
pages/home-page/home-page.wxml

@@ -34,7 +34,7 @@
 
     <view style="background: #fff;border-radius: 15rpx;">
       <view style="display: flex;flex-wrap: wrap;padding: 43rpx 0;align-items: center;">
-        <view class="app-item" style="width:20%;text-align: center;" icon-class="index-grid-item-icon-class" text-class="index-grid-item-text-class" content-class="index-grid-item-class" wx:for="{{functionItems}}" wx:for-item="item2" data-code="{{item2.FunctionCode}}"   data-url="{{item2.FormName}}" bindtap="toApp" wx:key="i" info="{{m1.getInfoNum(infocodes,infos,item2.FunctionCode)}}">
+        <view class="app-item" style="width:20%;text-align: center;" icon-class="index-grid-item-icon-class" text-class="index-grid-item-text-class" content-class="index-grid-item-class" wx:for="{{functionItems}}" wx:for-item="item2" data-code="{{item2.FunctionCode}}" data-url="{{item2.FormName}}" bindtap="toApp" wx:key="i" info="{{m1.getInfoNum(infocodes,infos,item2.FunctionCode)}}">
           <image src="{{item2.ImageUri}}" style="height: 80rpx;width:80rpx;margin-bottom: 11rpx;"></image>
           <view class="index-grid-item-text-class">{{item2.FunctionName}}</view>
         </view>
@@ -43,7 +43,7 @@
 
   </view>
 
- 
+
 
   <!-- 组合套餐 -->
   <view class="combined-card" wx:if="{{combinedList && combinedList.length > 0}}">
@@ -86,14 +86,16 @@
 
   <view wx:if="{{combinedList && combinedList.length == 0}}" style="margin-top: 50rpx;"></view>
 
-   <!-- 功能卡片 -->
+  <!-- 功能卡片 -->
 
-   <view class="func" style="margin-top: 0;border-radius: 40rpx 40rpx 0 0;">
+  <view class="func" style="margin-top: 0;border-radius: 40rpx 40rpx 0 0;">
     <view style="display:flex;flex-wrap: wrap;">
       <!-- 采购商城 -->
       <view class="func-card-blue" style="margin:20rpx 1% 0 2%;">
         <!-- 卡片头部 -->
-        <view class="card-title" data-url="/package4/pages/order-billing/order-billing" bindtap="toApp">
+        <view class="card-title" data-url="/package4/pages/order-billing/order-billing" bindtap="toApp" style=" position: relative;">
+
+          <image src="/static/img/diamond.png" class="icon-title_diamond" />
           <image src="/static/img/home-add-order.png" class="icon-title" />
           <view class="card-name card-name-blue">采购商城</view>
           <view class="icon-arrow icon-blue">
@@ -189,7 +191,8 @@
       <!-- 资金管理 -->
       <view class="func-card-blue" style="margin:20rpx 2% 0 1%;">
         <!-- 卡片头部 -->
-        <view class="card-title" data-url="/package4/pages/order-billing/customer-collection/customer-collection" bindtap="toApp">
+        <view class="card-title" style=" position: relative;" data-url="/package4/pages/order-billing/customer-collection/customer-collection" bindtap="toApp">
+          <image src="/static/img/diamond.png" class="icon-title_diamond" />
           <image src="/static/img/home-customer-payment.png" class="icon-title" />
           <view class="card-name card-name-blue">资金管理</view>
           <view class="icon-arrow icon-blue">
@@ -213,7 +216,8 @@
       <!-- 经营分析 -->
       <view class="func-card-blue" style="margin:20rpx 2% 0 1%;">
         <!-- 卡片头部 -->
-        <view class="card-title" data-url="/package4/pages/order-billing/customer-collection/customer-collection" bindtap="toApp">
+        <view class="card-title" style=" position: relative;" data-url="/package4/pages/order-billing/customer-collection/customer-collection" bindtap="toApp">
+          <image src="/static/img/diamond.png" class="icon-title_diamond" />
           <image src="/static/img/home-customer-payment.png" class="icon-title" />
           <view class="card-name card-name-blue">经营分析</view>
           <view class="icon-arrow icon-blue">

+ 16 - 4
pages/home-page/home-page.wxss

@@ -231,6 +231,13 @@ page {
   margin-top:20rpx;
   margin-left:20rpx
 }
+.icon-title_diamond{
+  width: 40rpx;
+  height: 40rpx;
+  position: absolute;
+  left: 5rpx;
+  top: -20rpx; 
+}
 
 .card-bottom{
   margin-top: 20rpx;
@@ -778,8 +785,13 @@ page {
   border-radius: 40rpx 40rpx 0rpx 0rpx !important;
 }
 
+.index-grid-item-text-class{
+  color:#1B365D !important;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  /* line-height: 34px; */
+  color: #1B365D;
+}
 
-
-/* 瀑布流 */
-
-/* pages/test/test.wxss */
+ 

+ 13 - 12
pages/index/index.wxml

@@ -14,8 +14,7 @@
 	var getInfoNum = function (array, infos, val) {
 		var num;
 		if (array.indexOf(val) >= 0) {
-			for (var i = 0; i < infos.length; i++) 
-			{ if (infos[i].code === val) { num = infos[i].num; break; } }
+			for (var i = 0; i < infos.length; i++) { if (infos[i].code === val) { num = infos[i].num; break; } }
 		} return num
 	}
 	module.exports.getInfoNum = getInfoNum; 
@@ -44,14 +43,16 @@
 <!-- 应用集合 -->
 <view wx:if="{{bingFlag == 0 }}">
 	<view class="panel-class" wx:for="{{regions}}" data-item="{{item}}" wx:key="index" title="{{item.FunctionName}}" wx:if="{{m1.hasAuth(functionRegions,item.FunctionName)}}">
-		<view class="app-name">{{item.FunctionName}}</view>
-    <view style="background: #fff;border-radius: 15rpx;">      
-      <view style="display: flex;flex-wrap: wrap;padding: 43rpx 0;align-items: center;">
-        <view class="app-item" style="width:25%;text-align: center;" icon-class="index-grid-item-icon-class" text-class="index-grid-item-text-class" content-class="index-grid-item-class" wx:for="{{functionItems}}" wx:for-item="item2"  data-code="{{item2.FunctionCode}}" wx:if="{{item.FunctionCodeOrder==item2.PFunctionCode}}" data-url="{{item2.FormName}}" bindtap="toApp" wx:key="i" info="{{m1.getInfoNum(infocodes,infos,item2.FunctionCode)}}" >
-          <image src="{{item2.ImageUri}}" style="height: 80rpx;width:80rpx;margin-bottom: 11rpx;"></image>
-          <view class="index-grid-item-text-class">{{item2.FunctionName}}</view>
-        </view>
-      </view>
-    </view>
+		<view class="app-name">{{item.FunctionName}}
+			<image wx:if="{{item.FunctionName == '资金管理' || item.FunctionName == '经营分析'}}" src="/static/img/diamond.png" class="icon-title_diamond" />
+		</view>
+		<view style="background: #fff;border-radius: 15rpx;">
+			<view style="display: flex;flex-wrap: wrap;padding: 43rpx 0;align-items: center;">
+				<view class="app-item" style="width:25%;text-align: center;" icon-class="index-grid-item-icon-class" text-class="index-grid-item-text-class" content-class="index-grid-item-class" wx:for="{{functionItems}}" wx:for-item="item2" data-code="{{item2.FunctionCode}}" wx:if="{{item.FunctionCodeOrder==item2.PFunctionCode}}" data-url="{{item2.FormName}}" bindtap="toApp" wx:key="i" info="{{m1.getInfoNum(infocodes,infos,item2.FunctionCode)}}">
+					<image src="{{item2.ImageUri}}" style="height: 80rpx;width:80rpx;margin-bottom: 11rpx;"></image>
+					<view class="index-grid-item-text-class">{{item2.FunctionName}}</view>
+				</view>
+			</view>
+		</view>
 	</view>
-</view>
+</view>

+ 8 - 0
pages/index/index.wxss

@@ -80,6 +80,14 @@ page {
   color: #1B365D;
 }
 
+.icon-title_diamond{
+  width: 35rpx;
+  height: 35rpx;
+  position: relative;
+  left: 5rpx;
+  top: 5rpx; 
+}
+
 .index-grid-item-icon-class{
   width: 80rpx !important;
   height: 80rpx !important;

+ 5 - 1
pages/login/login.js

@@ -27,6 +27,10 @@
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    setTimeout(()=>{
+      wx.reLaunch({
+        url: '../../pages/home-page/home-page',
+      })
+    },2000)
   }, 
 })

+ 5 - 1
pages/login/login.json

@@ -1,3 +1,7 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationStyle":"custom",
+  "navigationBarTextStyle": "white",
+  "navigationBarBackgroundColor": "#1B365D",
+  "navigationBarTitleText":"登录"
 }

+ 11 - 2
pages/login/login.wxml

@@ -1,2 +1,11 @@
-<!--pages/login/login.wxml-->
-<text>pages/login/login.wxml</text>
+
+<!-- 新引导页 -->
+<view style="height: 100vh;width:100%;background-color: #e6ebf3;text-align: center;">
+    <image class="{{loadFlag?'logo-image-active':'logo-image'}}" mode="aspectFit" src="../../static/img/logo.png" style="transition: 1s; width: 61.8%;"/>
+
+    <view style="position:absolute;width: 100%;top: 70%;">
+      <van-loading type="spinner" vertical><text style="color:rgb(129, 128, 128);">加载中</text></van-loading>
+    </view>
+</view>
+
+<van-dialog id="van-dialog" />

+ 50 - 1
pages/login/login.wxss

@@ -1 +1,50 @@
-/* pages/login/login.wxss */
+page {
+	overflow: hidden;
+  }
+  
+  .out-view {
+	background-color: #fff;
+  }
+  
+  .login-btn {
+	float: left;
+	width: 90% !important;
+	margin-left: 5%;
+  }
+  
+  .form-item {
+	width: 90%;
+	margin-left: 5%;
+	margin-bottom: 20rpx;
+  }
+  
+  .form-item input {
+	background-color: #f2f2f2;
+	font-size: 30rpx;
+	border: 2rpx solid #f2f2f2;
+	height: 62rpx;
+	line-height: 62rpx;
+	border-radius: 10rpx;
+	text-align: center;
+  }
+  
+  .pop-class {
+	width: 92%;
+	text-align: center;
+  }
+  
+  .van-popup-box {
+	width: 100vw;
+	height: 100vw;
+	display: flex;
+	align-content: center;
+	justify-items: center;
+  }
+  
+  .logo-image{
+	margin-top: 50%;opacity: 0;
+  }
+  
+  .logo-image-active{
+	margin-top: 30%;opacity: 1;
+  }

+ 48 - 39
pages/mine/mine.js

@@ -116,7 +116,7 @@ Page({
       })
       return
     }
-  }, 
+  },
 
   /**
     * @desc : 设置跳转
@@ -151,13 +151,13 @@ Page({
   },
 
   toOtherPage(e) {
-    
+
     let type = e.currentTarget.dataset.type
     let dateValue = e.currentTarget.dataset.datevalue
     let jumpType = e.currentTarget.dataset.jumptype
     let url = "";
     let param = {};
- 
+
     let dateObj = {
       today: { text: '本日', value: 1 },
       nearly30days: { text: '近30天', value: 5 },
@@ -166,7 +166,7 @@ Page({
 
 
     let staffObj = {}
-   
+
     if (jumpType === 2) {
       staffObj = {
         staffId: app.globalData.user.userId,
@@ -278,7 +278,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {      
+  onLoad: function (options) {
     //20220820加入和客户列表的权限
     let customerflg = common.hasPageUUidRight(Constants.PAGE_RIGHT.CUSTOMERS)
     let orderflg = common.hasPageUUidRight(Constants.PAGE_RIGHT.ORDER_BILLING)
@@ -291,7 +291,7 @@ Page({
       orderflg,
       receivecustomersflg,
       waitApprovalflg,
-      version:wx.getAccountInfoSync().miniProgram.version,
+      version: wx.getAccountInfoSync().miniProgram.version,
     })
     /**
      * @desc : 获取用户信息
@@ -312,7 +312,7 @@ Page({
     })
 
     this.getReportData()
- 
+
 
     this.getNoticeCount()
   },
@@ -330,7 +330,7 @@ Page({
     }
 
     api.request(Constants.WX_REPORT + 'select_report_batch', 'POST', params).then(res => {
-  
+
       if (res.data.code === 200) {
         this.setData({
           storeHelper: res.data.data.storeHelper,
@@ -403,14 +403,14 @@ Page({
   },
   onShow() {
     if (this.data.mineFlag) {
-      
+
       this.getAppCount()
       /** 获取胶囊信息 */
       this.setData({
         menuBtnInfo: wx.getMenuButtonBoundingClientRect()
       })
       this.getReportData()
-    
+
       this.getNoticeCount()
     }
   },
@@ -418,45 +418,54 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-   
+
     let that = this
     //调用刷新时将执行的方法
     that.setData({
       loadingShow: true,
     })
-      this.getAppCount()
-      /** 获取胶囊信息 */
-      this.setData({
-        menuBtnInfo: wx.getMenuButtonBoundingClientRect()
+    this.getAppCount()
+    /** 获取胶囊信息 */
+    this.setData({
+      menuBtnInfo: wx.getMenuButtonBoundingClientRect()
+    })
+    this.getReportData()
+    this.getNoticeCount()
+    //隐藏导航条加载动画
+    wx.hideNavigationBarLoading();
+    setTimeout(function () {
+      that.setData({
+        loadingShow: false,
       })
-      this.getReportData()
-      this.getNoticeCount()
-            //隐藏导航条加载动画
-      wx.hideNavigationBarLoading();
-      setTimeout(function () {
-        that.setData({
-          loadingShow: false,
-        })
-        //停止下拉刷新
-        wx.stopPullDownRefresh();
-      }, 800)
-    
+      //停止下拉刷新
+      wx.stopPullDownRefresh();
+    }, 800)
+
   },
-  
+
   /**
    *  检测是否有新版本-手动更新
    */
-  checkHasManualUpdate(){
+  checkHasManualUpdate() {
     app.checkHasManualUpdate()
   },
-   /**
-   *  当前版本号
-   */
-  getAccountInfoSync(){
-      const accountInfo = wx.getAccountInfoSync();
-      wx.showToast({
-        title: '当前版本号:' + accountInfo.miniProgram.version,
-        icon:'none', 
-      })     
-    },
+  /**
+  *  当前版本号
+  */
+  getAccountInfoSync() {
+    const accountInfo = wx.getAccountInfoSync();
+    wx.showToast({
+      title: '当前版本号:' + accountInfo.miniProgram.version,
+      icon: 'none',
+    })
+  },
+
+  /**
+ * 注册商户
+ */
+  register() {
+    wx.navigateTo({
+      url: '',
+    })
+  },
 })

+ 38 - 13
pages/mine/mine.wxml

@@ -44,16 +44,16 @@
     <view class="todo-view-title">待办工作</view>
     <view class="todo-view-app">
 
-      <view class="todo-view-app-item"  >
+      <view class="todo-view-app-item">
         <view class="todo-view-app-item-icon" catchtap="toApprove">
           <!-- 待办角标提醒 -->
-          <view class="todo-view-app-item-icon-tip"  >{{appCount}}</view>
+          <view class="todo-view-app-item-icon-tip">{{appCount}}</view>
           <image src="../../static/img/spzx.png" style="width:100%;height:100%;" />
         </view>
         <view class="todo-view-app-item-name">待审中心</view>
       </view>
       <!-- 20220820加入和客户列表的权限 -->
-      <view class="todo-view-app-item"   catchtap="toOtherPage" data-type="{{10}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}">
+      <view class="todo-view-app-item" catchtap="toOtherPage" data-type="{{10}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}">
         <view class="todo-view-app-item-icon">
           <!-- 待办角标提醒 -->
           <view class="todo-view-app-item-icon-tip" wx:if="{{staffHelper.publicCustomerCount}}">{{staffHelper.publicCustomerCount}}</view>
@@ -62,7 +62,7 @@
         <view class="todo-view-app-item-name">待成交</view>
       </view>
 
-      <view class="todo-view-app-item"   catchtap="toOtherPage" data-type="{{10}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}">
+      <view class="todo-view-app-item" catchtap="toOtherPage" data-type="{{10}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}">
         <view class="todo-view-app-item-icon">
           <!-- 待办角标提醒 -->
           <view class="todo-view-app-item-icon-tip" wx:if="{{staffHelper.publicCustomerCount}}">{{staffHelper.publicCustomerCount}}</view>
@@ -75,7 +75,7 @@
   </view>
 
   <van-tabs animated active="{{ active }}" swipeable nav-class="mine-tabs-custom-class" bind:change="onChange">
-    <van-tab title="标签 1" name="store" >
+    <van-tab title="标签 1" name="store">
       <!-- 助手 -->
       <view class="helper-out-view">
         <view class="helper-view">
@@ -136,7 +136,7 @@
 
             <view class="help-view-content-item" catchtap="toOtherPage" data-type="{{6}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}" style="--filterBlur--:{{filterBlur1}}">
               <view class="help-view-content-item-important">
-               3
+                3
                 <view class="help-view-content-item-important-small">户</view>
               </view>
               <view class="help-view-content-item-text">设计制图</view>
@@ -151,7 +151,7 @@
             </view>
             <view class="help-view-content-item" catchtap="toOtherPage" data-type="{{8}}" data-jumptype="{{1}}" data-datevalue="{{storeHelperValue}}" style="--filterBlur--:{{filterBlur1}}">
               <view class="help-view-content-item-important">
-               67
+                67
                 <view class="help-view-content-item-important-small">户</view>
               </view>
               <view class="help-view-content-item-text">留资客户数</view>
@@ -184,8 +184,8 @@
             <view class="task-progress-content-left" style="--filterBlur--:{{filterBlur2}}">
               <view><text class="small-cny">¥</text>155,546.00</view>
               <view>成交额(万)</view>
-              <view style="font-size: 12px;color:#95A8CB;">同比:<text class="small-cny">50 ↑  </text>环比<text class="small-cny_red">    50 ↓</text> </view>
-         
+              <view style="font-size: 12px;color:#95A8CB;">同比:<text class="small-cny">50 ↑ </text>环比<text class="small-cny_red"> 50 ↓</text> </view>
+
             </view>
             <view class="task-progress-content-right" style="--filterBlur--:{{filterBlur2}}">
               <view>58.98%</view>
@@ -197,7 +197,7 @@
           </view>
           <inner-loading wx:if="{{filterBlur2==='5px'}}"></inner-loading>
         </view>
-       
+
       </view>
 
       <!-- 收款任务进度 -->
@@ -213,8 +213,8 @@
             <view class="task-progress-content-left" style="--filterBlur--:{{filterBlur3}}">
               <view><text class="small-cny">¥</text>155,546.00</view>
               <view>收款额(万)</view>
-              <view style="font-size: 12px;color:#95A8CB;">同比:<text class="small-cny">50 ↑  </text>环比<text class="small-cny_red">    50 ↓</text> </view>
-         
+              <view style="font-size: 12px;color:#95A8CB;">同比:<text class="small-cny">50 ↑ </text>环比<text class="small-cny_red"> 50 ↓</text> </view>
+
             </view>
             <view class="task-progress-content-right" style="--filterBlur--:{{filterBlur3}}">
               <view>58.98%</view>
@@ -226,7 +226,7 @@
           </view>
           <inner-loading wx:if="{{filterBlur3==='5px'}}"></inner-loading>
         </view>
-       
+
       </view>
 
     </van-tab>
@@ -399,5 +399,30 @@
   </view>
 
   <view style="height: 39rpx;"></view>
+  <view class="todo-view">
+    <view class="todo-view-title" catch:tap="register">注册商户</view>
+  </view>
+  <view style="height: 30rpx;"></view>
+  <view class="todo-view">
+    <view class="todo-view-title">商户设置</view>
+  </view>
+  <view style="height: 30rpx;"></view>
+  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
+    <view class="todo-view-title ">标准版</view>
+
+    <view class="todo-view-title" style="display: flex;justify-content:space-between;align-items: center;">
+      <image src="../../static/img/diamond.png" style="width:40rpx;height:40rpx; margin-right: 10rpx;" />
+    升级专业版</view>
+  </view>
+  <view style="height: 30rpx;"></view>
+  <view class="todo-view" style="display: flex;justify-content:space-between;align-items: center;">
+    <view class="todo-view-title">推荐有礼</view>
+    <view style="font-size: 12px;color: grey;" >积分:3500</view>
+  </view>
+  <view style="height: 59rpx;"></view>
+  <view style="padding: 30rpx;">
+    <dk-button style="width: 100%; background: red;" size="large" type="danger">退出 </dk-button>
+  </view>
+
 
 </view>

BIN
static/img/diamond.png