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

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",

package-basic-data/pages/basic-data/basic-data.js

@@ -60,10 +60,9 @@ Page({
         reasonName: '原因名称'
       },
       {
-        typeName: '资金账户',
-        paymentCode: '账户编码',
-        paymentType: '账户类型',
-        paymentName: '账户名称'
+        typeName: '收付方式',
+        paymentCode: '收付编码',
+        paymentName: '收付名称'
       },
 
 
@@ -216,32 +215,21 @@ Page({
       {
         paymentCode: 'SF00001',
         paymentName: '微信',
-        paymentType: '民生银行0033',
-        flagValue: true,
-        defFlag: true
+        flagValue: true
       },
       {
         paymentCode: 'SF00002',
         paymentName: '现金',
-        paymentType: '中国银行',
-        flagValue: true,
-        list:[
-          {
-            field1:'SF00002-001',
-            field2:'中国银行0020',
-          }
-        ]
+        flagValue: true
       },
       {
         paymentCode: 'SF00003',
         paymentName: '银行转账',
-        paymentType: '中国银行',
         flagValue: true
       },
       {
         paymentCode: 'SF00004',
         paymentName: '支付宝',
-        paymentType: '中国银行',
         flagValue: true
       }
     ],
@@ -285,7 +273,7 @@ Page({
     if (name == '出库原因') {
       tableData = this.data.test05
     }
-    if (name == '资金账户') {
+    if (name == '收付方式') {
       tableData = this.data.test06
     }
     this.setData({
@@ -388,7 +376,7 @@ Page({
       },
       {
         id: 1,
-        name: '资金账户'
+        name: '收付方式'
       },
 
     ]

package-basic-data/pages/basic-data/basic-data.wxml

@@ -27,10 +27,7 @@
                 <view style="font-size: 15px;font-weight: 600;width: 80%;">
                   {{fieldData.typeName}}
                 </view>
-                <view wx:if="{{item.defFlag}}" style="height: 49rpx;border-radius: 6rpx;background-color: #CAA977;text-align: center;width: 20%;">
-                  <text style=" font-size: 13px;color:  #FFFFFF;">默认</text>
-                </view>
-                <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;margin-left: 8rpx;">
+                <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;">
                   <text style=" font-size: 13px;color:  #FFFFFF;">{{item.flagValue ? '启用' : '停用'}}</text>
                 </view>
               </view>
@@ -52,41 +49,6 @@
             </view>
 
 
-            <view wx:if="{{item.list && item.list.length > 0}}">
-              <view wx:for="{{item.list}}" wx:for-index="index_" wx:for-item="item_">
-                <view class="table-row">
-                  <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_.field1}}"></dk-text>
-                      </view>
-                      <view class="table-content-class">
-                        {{item_.field1}}
-                      </view>
-                    </view>
-                  </view>
-
-                  <view style="height: 49rpx;border-radius: 6rpx;background-color: {{ item.flagValue ?'#77C5D5':'rgba(228, 0, 43, 1)'}};text-align: center;width: 20%;margin-top: 10rpx;">
-                    <text style=" font-size: 13px;color:  #FFFFFF;">{{item.flagValue ? '启用' : '停用'}}</text>
-                  </view>
-                </view>
-
-                <view class="table-row">
-                  <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_.field2}}"></dk-text>
-                      </view>
-                      <view class="table-content-class">
-                        {{item_.field2}}
-                      </view>
-                    </view>
-                  </view>
-                </view>
-              </view>
-            </view>
-
-
           </view>
         </view>
         <view data-index="{{index}}" bind:tap="onCloseDel" slot="right">{{item.flagValue ? '停用' : '启用'}}</view>
@@ -111,52 +73,34 @@
 
   <view wx:for="{{fieldData}}" wx:for-index="key" wx:for-item="value" wx:if="{{'typeName' != key}}">
 
-    <van-field wx:if="{{key == 'warehouseCode' || key == 'channelCode' || key =='incomeCode' || key =='expenditureCode' || key =='reasonCode'|| key =='paymentCode' }}" disabled="{{true}}" input-width="200rpx"  input-align="right" label-class="nomal-label" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
+    <van-field wx:if="{{key == 'warehouseCode' || key == 'channelCode' || key =='incomeCode' || key =='expenditureCode' || key =='reasonCode'|| key =='paymentCode' }}" disabled="{{true}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
     </van-field>
-    <van-field wx:if="{{key !== 'warehouseCode' &&  key !== 'channelCode' &&  key !=='incomeCode' && key !=='expenditureCode' &&  key !=='reasonCode' && key !=='paymentCode' }}" disabled="{{false}}" input-width="200rpx"  label-class="{{(key == 'warehouseName' || key == 'channelName' || key =='incomeName' &&  key =='expenditureName' || key =='reasonName'|| key =='paymentName' ) ? 'red-label':'' }}" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
+    <van-field wx:if="{{key !== 'warehouseCode' &&  key !== 'channelCode' &&  key !=='incomeCode' && key !=='expenditureCode' &&  key !=='reasonCode' && key !=='paymentCode' }}" disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="{{(key == 'warehouseName' || key == 'channelName' || key =='incomeName' &&  key =='expenditureName' || key =='reasonName'|| key =='paymentName' ) ? 'red-label':'' }}" maxlength="50" value="{{ showPopupItem[key] }}" input-align="right" label="{{ value}}" placeholder="{{'请输入' + value}}" autosize border="{{ false }}">
     </van-field>
 
 
 
   </view>
 
-  <van-field disabled="{{false}}" input-width="200rpx"  label-class="nomal-label" maxlength="50" value="" input-align="right" label="备注" placeholder="{{'请输入' + '备注'}}" autosize border="{{ false }}">
-  </van-field>
-
-  <view wx:if="{{fieldData.typeName == '资金账户'}}">
-
-    <van-field disabled="{{false}}" input-width="200rpx"  label-class="nomal-label" maxlength="50" value="SF00001-001" input-align="right" label="下级账户编码" placeholder="{{'请输入' + ''}}" autosize border="{{ false }}">
-  </van-field>
-
-  <van-field disabled="{{false}}" input-width="200rpx"  label-class="nomal-label" maxlength="50" value="银行卡" input-align="right" label="下级账户类型" placeholder="{{'请输入' + ''}}" autosize border="{{ false }}">
-  </van-field>
-  <van-field disabled="{{false}}" input-width="200rpx"   label-class="red-label" maxlength="50" value="民生银行0066" input-align="right" label="下级账户名称" placeholder="{{'请输入' + ''}}" autosize border="{{ false }}">
+  <van-field disabled="{{false}}" input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" maxlength="50" value="" input-align="right" label="备注" placeholder="{{'请输入' + '备注'}}" autosize border="{{ false }}">
   </van-field>
 
-    <van-field input-width="200rpx"  input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ form.customerForm.addressNo }}" input-align="right" label="默认账户" autosize border="{{ false }}" bind:change="changeCustomerFormField" readonly="{{true}}">
-      <view slot="inputbefor" style="text-align: left;padding-left: 10rpx;" data-item="{{form.designGraphics}}" catchtap="onDesignGraphicsChange">
-        <van-checkbox shape="round" value="{{form.designGraphics}}" />
-      </view>
-    </van-field>
-
-  </view>
-
 
 
-  <!-- <van-field input-width="200rpx"  input-align="left" label-class="red-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.name }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+  <!-- <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="red-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.name }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
   </van-field>
 
-  <van-field input-width="200rpx"  input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="仓库主管" placeholder="请输入仓库主管" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="仓库主管" placeholder="请输入仓库主管" autosize border="{{ false }}" bind:change="changeCustomerFormField">
   </van-field>
 
-  <van-field input-width="200rpx"  input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="主管电话" placeholder="请输入主管电话" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.value }}" input-align="right" label="主管电话" placeholder="请输入主管电话" autosize border="{{ false }}" bind:change="changeCustomerFormField">
   </van-field>
 
-  <van-field input-width="200rpx"  input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.remark }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+  <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ showPopupItem.remark }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeCustomerFormField">
   </van-field> -->
 
   <!-- 保留 -->
-  <!-- <van-field input-width="200rpx"  input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ form.customerForm.addressNo }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
+  <!-- <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="addressNo" maxlength="50" value="{{ form.customerForm.addressNo }}" input-align="right" label="仓库名称" placeholder="请输入仓库名称" autosize border="{{ false }}" bind:change="changeCustomerFormField">
   </van-field> -->
 
 

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() {
-
-    }
-})

package-basic-data/pages/customer-reception/collection/collection.json

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

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>

package-basic-data/pages/customer-reception/collection/collection.wxss

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

package-sales/pages/choose-goods/choose-goods.js

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

package-sales/pages/choose-goods/choose-goods.json

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

package-sales/pages/choose-goods/choose-goods.wxml

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

package-sales/pages/choose-goods/choose-goods.wxss

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

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() {
-
-    }
-})

package-sales/pages/detail/detail.json

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

package-sales/pages/detail/detail.wxml

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

package-sales/pages/detail/detail.wxss

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

package-sales/pages/order-billing/add/add.js

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

package-sales/pages/order-billing/add/add.json

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

package-sales/pages/order-billing/add/add.wxml

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

package-sales/pages/order-billing/add/add.wxss

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

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() {
-
-    }
-})

package-sales/pages/order-billing/collection/collection.json

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

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>

package-sales/pages/order-billing/collection/collection.wxss

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

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() {
-
-    }
-})

package-sales/pages/order-billing/deal/deal.json

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

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>

package-sales/pages/order-billing/deal/deal.wxss

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

package-sales/pages/order-billing/order-billing.js

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

package-sales/pages/order-billing/order-billing.json

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

package-sales/pages/order-billing/order-billing.wxml

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

package-sales/pages/order-billing/order-billing.wxss

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

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">

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 */
+ 

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>

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;

pages/login/login.js

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

pages/login/login.json

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

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" />

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;
+  }

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: '',
+    })
+  },
 })

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>