Browse Source

订单列表

zhaoxiaohai 2 years ago
parent
commit
f11085b926

+ 2 - 1
app.json

@@ -9,7 +9,8 @@
       "pages": [
         "market/index",
         "market/detail",
-        "shopping/index"
+        "shopping/index",
+        "orderForm/index"
       ]
     }
   ],

+ 4 - 0
components/Yl_HeadNav/index.js

@@ -39,6 +39,10 @@ Component({
         record: { //记录历史
             type: Boolean,
             value: true
+        },
+        placeholder: {
+            type: String,
+            value: "搜索商品"
         }
     },
     data: {

+ 1 - 1
components/Yl_HeadNav/index.wxml

@@ -12,7 +12,7 @@
 <view class="Yl_head_1" wx:else>
     <view class="search">
         <view class="iconfont icon-a-sousuolansousuo" style="padding-left:20rpx;margin-right: 10rpx;" />
-        <input class="input" value="{{condition}}" bindconfirm="confirmSearch" type="text" placeholder="搜索商品" style="flex: 1;" />
+        <input class="input" value="{{condition}}" bindconfirm="confirmSearch" type="text" placeholder="{{placeholder}}" style="flex: 1;" />
         <navigator wx:if="{{condition}}" bindtap="endSearch" url="#" class="iconfont icon-quxiao" />
     </view>
     <navigator url="#" class="but" bindtap="onChick1" data-id="sort"><text class="iconfont icon-shengxu"></text>排序</navigator>

+ 18 - 7
packageA/market/detail.js

@@ -98,16 +98,27 @@ Page({
   /* 加入购物车 */
   storage() {
     _Http.basic({
-      "id": "20220926142403",
+      "id": 20220924095102,
       "content": {
-        "sa_itemgroupid": this.data.sa_itemgroupid
-      }
+        "sa_brandid": this.data.detail.brand[0].sa_brandid, //品牌id
+        "itemid": this.data.detail.itemid, //货品id
+        "qty": 1, //数量
+        "itemno": this.data.itemno //货品编号
+      },
     }).then(res => {
-      console.log(res)
-      if (res.msg != '成功') return wx.showToast({
-        title: res.msg,
+      console.log("加入购物车", res)
+      wx.showToast({
+        title: res.msg != '成功' ? res.msg : '已加入到购物车',
         icon: "none"
-      })
+      });
+      if (res.msg == '成功') _Http.basic({
+        "id": 20220927093202,
+        "content": {}
+      }, false).then(res => {
+        console.log("购物车数量", res)
+        getApp().globalData.num = res.data.num;
+        this.selectComponent("#Float").setNum(res.data.num)
+      });
     })
   },
   onShow() {

+ 1 - 1
packageA/market/detail.wxml

@@ -16,7 +16,7 @@
 		{{detail.itemname}}
 	</view>
 	<view class="tags">
-		<text>班尼戈</text><text>水务</text>
+		<text wx:for="{{detail.brand}}" wx:key="item.sa_brandid">{{item.brandname}}</text><text>水务</text>
 	</view>
 	<view class="offer">
 		<view>

+ 1 - 1
packageA/market/index.js

@@ -75,7 +75,7 @@ Page({
 		})
 	},
 	/* 获取产品 */
-	getList(init) {
+	getList(init=false) {
 		if (init.detail != undefined) init = init.detail;
 		let content = this.data.content;
 		if (init) content.pageNumber = 1;

+ 64 - 0
packageA/orderForm/index.js

@@ -0,0 +1,64 @@
+const _Http = getApp().globalData.http;
+
+Page({
+  data: {
+    loading: true,
+    amount: 0,
+    "content": {
+      "isExport": 0,
+      "pageNumber": 1,
+      "pageTotal": 1,
+      "pageSize": 20,
+      total: 0,
+      "where": {
+        "condition": "",
+        "status": "",
+        "brandname": "",
+        "tradefield": ""
+      },
+      sort: []
+    },
+  },
+  onLoad(options) {
+    this.getList()
+  },
+  /* 获取产品 */
+  getList(init = false) {
+    if (init.detail != undefined) init = init.detail;
+    let content = this.data.content;
+    if (init) content.pageNumber = 1;
+    if (content.pageNumber > content.pageTotal) return;
+    _Http.basic({
+      "id": 20221224180302,
+      content
+    }).then(res => {
+      console.log("订单列表", res)
+      this.selectComponent('#ListBox').RefreshToComplete();
+      this.setData({
+        list: res.data,
+        "content.pageNumber": res.pageNumber + 1,
+        "content.pageTotal": res.pageTotal,
+        "content.sort": res.sort,
+        "content.total": res.total,
+        loading: false,
+        amount: res.tips.amount
+      })
+    })
+  },
+  /* 搜索 */
+  onSearch({
+    detail
+  }) {
+    this.setData({
+      "content.where.condition": detail
+    });
+    this.getList(true)
+  },
+  onReady() {
+    this.setListHeight()
+  },
+  /* 设置页面高度 */
+  setListHeight() {
+    this.selectComponent("#ListBox").setHeight(".tips", this);
+  },
+})

+ 5 - 0
packageA/orderForm/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "List": "./modules/list/index"
+  }
+}

+ 13 - 0
packageA/orderForm/index.scss

@@ -0,0 +1,13 @@
+@import "./index.skeleton.wxss";
+
+.tips {
+	width: 750rpx;
+	text-align: center;
+	height: 64rpx;
+	line-height: 64rpx;
+	background: #FFEFD9;
+	font-size: 28rpx;
+	font-family: PingFang SC-Semibold, PingFang SC;
+	font-weight: 600;
+	color: #FA8C16;
+}

+ 205 - 0
packageA/orderForm/index.skeleton.wxml

@@ -0,0 +1,205 @@
+<!--
+此文件为开发者工具生成,生成时间: 2022/12/28上午9:52:47
+使用方法:
+在 E:\云链项目\e-wechat\packageA\orderForm\index.wxml 引入模板
+
+```
+<import src="index.skeleton.wxml"/>
+<template is="skeleton" wx:if="{{loading}}" />
+```
+
+在 E:\云链项目\e-wechat\packageA\orderForm\index.wxss 中引入样式
+```
+@import "./index.skeleton.wxss";
+```
+
+更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+-->
+<template name="skeleton">
+  <view class="sk-container">
+    <view is="components/Yl_HeadNav/index">
+      <view class="Yl_head_1 HeadNav-index--Yl_head_1">
+        <view class="search HeadNav-index--search">
+          <view class="iconfont HeadNav-index--iconfont icon-a-sousuolansousuo HeadNav-index--icon-a-sousuolansousuo sk-pseudo sk-pseudo-circle" style="padding-left:10px;margin-right: 5px;"></view>
+          <view class="input HeadNav-index--input sk-image" placeholder="搜索" style="flex: 1;" type="text" value="true"></view>
+        </view>
+        <navigator class="but HeadNav-index--but sk-transparent" data-id="sort">
+          <text class="iconfont HeadNav-index--iconfont icon-shengxu HeadNav-index--icon-shengxu sk-pseudo sk-pseudo-circle"></text>排序</navigator>
+        <navigator class="but HeadNav-index--but sk-transparent" data-id="filtrate">
+          <text class="iconfont HeadNav-index--iconfont icon-shaixuan HeadNav-index--icon-shaixuan sk-pseudo sk-pseudo-circle"></text>筛选</navigator>
+      </view>
+      <view is="miniprogram_npm/@vant/weapp/transition/index"></view>
+      <view is="miniprogram_npm/@vant/weapp/popup/index">
+        <view is="miniprogram_npm/@vant/weapp/overlay/index">
+          <view is="miniprogram_npm/@vant/weapp/transition/index"></view>
+        </view>
+      </view>
+    </view>
+    <view is="miniprogram_npm/@vant/weapp/tabs/index">
+      <view class=" van-tabs tabs-index--van-tabs van-tabs--line tabs-index--van-tabs--line">
+        <view is="miniprogram_npm/@vant/weapp/sticky/index">
+          <view class=" van-sticky sticky-index--van-sticky" style="z-index:1">
+            <view class="van-sticky-wrap sticky-index--van-sticky-wrap" style="z-index:1">
+              <view class="van-tabs__wrap tabs-index--van-tabs__wrap ">
+                <scroll-view class="van-tabs__scroll tabs-index--van-tabs__scroll van-tabs__scroll--line tabs-index--van-tabs__scroll--line" scroll-left="0" style="border-color: var(--assist)">
+                  <view class="van-tabs__nav tabs-index--van-tabs__nav van-tabs__nav--line tabs-index--van-tabs__nav--line " style="true">
+                    <view class="van-tabs__line tabs-index--van-tabs__line" style="width:40px;opacity:1;transform:translateX(17.5px);-webkit-transform:translateX(17.5px);background-color:var(--assist);transition-duration:0.3s;-webkit-transition-duration:0.3s"></view>
+                    <view class="  van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab van-tab--active tabs-index--van-tab--active" data-index="0" style="color:var(--assist)">
+                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-894 sk-text" style="background-position-x: 50%;">
+                        全部
+                      </view>
+                    </view>
+                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="1" style="true">
+                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-312 sk-text" style="background-position-x: 50%;">
+                        新建
+                      </view>
+                    </view>
+                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="2" style="true">
+                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-931 sk-text" style="background-position-x: 50%;">
+                        提交
+                      </view>
+                    </view>
+                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="3" style="true">
+                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-945 sk-text" style="background-position-x: 50%;">
+                        审核
+                      </view>
+                    </view>
+                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="4" style="true">
+                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-182 sk-text" style="background-position-x: 50%;">
+                        完成
+                      </view>
+                    </view>
+                  </view>
+                </scroll-view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="van-tabs__content tabs-index--van-tabs__content">
+          <view class="van-tabs__track tabs-index--van-tabs__track van-tabs__track tabs-index--van-tabs__track" style="true">
+            <view is="miniprogram_npm/@vant/weapp/tab/index">
+              <view class=" van-tab__pane tab-index--van-tab__pane van-tab__pane--active tab-index--van-tab__pane--active" style="true"></view>
+            </view>
+            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
+            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
+            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
+            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="tips sk-transparent sk-text-28-1250-739 sk-text" style="background-position-x: 50%;">
+      共计7单,合计¥1170
+    </view>
+    <view is="components/Yl_ListBox/index" id="ListBox">
+      <scroll-view scroll-y="true" class="ListBox-index--scroll-view" refresher-enabled="true" style="height: 598px;">
+        <view is="packageA/orderForm/modules/list/index">
+          <navigator class="list-index--item">
+            <view class="list-index--top">
+              <view class="list-index--tags">
+                <text class="sk-transparent sk-text-25-0000-280 sk-text">标准订单</text>
+                <text class="sk-transparent sk-text-25-0000-544 sk-text">班尼戈</text>
+              </view>
+              <view class="list-index--statu sk-transparent sk-text-14-2857-683 sk-text" style="color: #999999;">
+                关闭
+              </view>
+            </view>
+            <view class="list-index--content">
+              <view class="list-index--num sk-transparent sk-text-15-0000-289 sk-text">
+                订单号:SO202211300012
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-518 sk-text">
+                区域经理:
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-715 sk-text">
+                单据日期:2022-11-30 16:38:01
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-222 sk-text">
+                共计120件商品
+              </view>
+              <view class="list-index--amount sk-transparent sk-text-14-2857-347 sk-text">
+                合计:¥0
+              </view>
+            </view>
+            <view class="list-index--bottom sk-transparent sk-text-33-3333-962 sk-text">
+              收货人信息
+            </view>
+          </navigator>
+          <navigator class="list-index--item">
+            <view class="list-index--top">
+              <view class="list-index--tags">
+                <text class="sk-transparent sk-text-25-0000-204 sk-text">标准订单</text>
+                <text class="sk-transparent sk-text-25-0000-847 sk-text">班尼戈</text>
+              </view>
+              <view class="list-index--statu sk-transparent sk-text-14-2857-503 sk-text" style="color: #999999;">
+                关闭
+              </view>
+            </view>
+            <view class="list-index--content">
+              <view class="list-index--num sk-transparent sk-text-15-0000-326 sk-text">
+                订单号:SO202211300013
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-349 sk-text">
+                区域经理:
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-832 sk-text">
+                单据日期:2022-11-30 21:56:19
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-703 sk-text">
+                共计30件商品
+              </view>
+              <view class="list-index--amount sk-transparent sk-text-14-2857-240 sk-text">
+                合计:¥300
+              </view>
+            </view>
+            <view class="list-index--bottom sk-transparent sk-text-33-3333-993 sk-text">
+              收货人信息
+            </view>
+          </navigator>
+          <navigator class="list-index--item">
+            <view class="list-index--top">
+              <view class="list-index--tags">
+                <text class="sk-transparent sk-text-25-0000-307 sk-text">标准订单</text>
+                <text class="sk-transparent sk-text-25-0000-15 sk-text">班尼戈</text>
+              </view>
+              <view class="list-index--statu sk-transparent sk-text-14-2857-117 sk-text" style="color: #999999;">
+                关闭
+              </view>
+            </view>
+            <view class="list-index--content">
+              <view class="list-index--num sk-transparent sk-text-15-0000-695 sk-text">
+                订单号:SO202211300014
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-219 sk-text">
+                区域经理:
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-833 sk-text">
+                单据日期:2022-11-30 22:16:06
+              </view>
+              <view class="list-index--exp sk-transparent sk-text-14-2857-51 sk-text">
+                共计100件商品
+              </view>
+              <view class="list-index--amount sk-transparent sk-text-14-2857-920 sk-text">
+                合计:¥360
+              </view>
+            </view>
+            <view class="list-index--bottom sk-transparent sk-text-33-3333-615 sk-text">
+              收货人信息
+            </view>
+          </navigator>
+          <navigator class="list-index--item">
+            <view class="list-index--top">
+              <view class="list-index--tags">
+                <text class="sk-transparent sk-text-25-0000-767 sk-text">标准订单</text>
+                <text class="sk-transparent sk-text-25-0000-348 sk-text">班尼戈</text>
+              </view>
+              <view class="list-index--statu sk-transparent sk-text-14-2857-287 sk-text" style="color: #333333;">
+                新建
+              </view>
+            </view>
+          </navigator>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>

+ 224 - 0
packageA/orderForm/index.skeleton.wxss

@@ -0,0 +1,224 @@
+/*
+此文件为开发者工具生成,生成时间: 2022/12/28上午9:52:48
+
+在 E:\云链项目\e-wechat\packageA\orderForm\index.wxss 中引入样式
+```
+@import "./index.skeleton.wxss";
+```
+
+更多详细信息可以参考文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+*/
+.sk-transparent {
+    color: transparent !important;
+  }
+.sk-text-34-0909-894 {
+    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
+    background-size: 100% 88.0000rpx;
+    position: relative !important;
+  }
+.sk-text {
+    background-origin: content-box !important;
+    background-clip: content-box !important;
+    background-color: transparent !important;
+    color: transparent !important;
+    background-repeat: repeat-y !important;
+  }
+.sk-text-34-0909-312 {
+    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
+    background-size: 100% 88.0000rpx;
+    position: relative !important;
+  }
+.sk-text-34-0909-931 {
+    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
+    background-size: 100% 88.0000rpx;
+    position: relative !important;
+  }
+.sk-text-34-0909-945 {
+    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
+    background-size: 100% 88.0000rpx;
+    position: relative !important;
+  }
+.sk-text-34-0909-182 {
+    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
+    background-size: 100% 88.0000rpx;
+    position: relative !important;
+  }
+.sk-text-28-1250-739 {
+    background-image: linear-gradient(transparent 28.1250%, #EEEEEE 0%, #EEEEEE 71.8750%, transparent 0%) !important;
+    background-size: 100% 64.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-280 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-544 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-683 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-15-0000-289 {
+    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-518 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-715 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-222 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-347 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: absolute !important;
+  }
+.sk-text-33-3333-962 {
+    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
+    background-size: 100% 72.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-204 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-847 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-503 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-15-0000-326 {
+    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-349 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-832 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-703 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-240 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: absolute !important;
+  }
+.sk-text-33-3333-993 {
+    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
+    background-size: 100% 72.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-307 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-15 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-117 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-text-15-0000-695 {
+    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-219 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-833 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-51 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 33.6000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-920 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: absolute !important;
+  }
+.sk-text-33-3333-615 {
+    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
+    background-size: 100% 72.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-767 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-25-0000-348 {
+    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
+    background-size: 100% 40.0000rpx;
+    position: relative !important;
+  }
+.sk-text-14-2857-287 {
+    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
+    background-size: 100% 39.2000rpx;
+    position: relative !important;
+  }
+.sk-pseudo::before, .sk-pseudo::after {
+      background: #EFEFEF !important;
+      background-image: none !important;
+      color: transparent !important;
+      border-color: transparent !important;
+    }
+.sk-pseudo-rect::before, .sk-pseudo-rect::after {
+      border-radius: 0 !important;
+    }
+.sk-pseudo-circle::before, .sk-pseudo-circle::after {
+      border-radius: 50% !important;
+    }
+.sk-image {
+    background: #EFEFEF !important;
+  }
+.sk-container {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background-color: transparent;
+  }

+ 17 - 0
packageA/orderForm/index.wxml

@@ -0,0 +1,17 @@
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{loading}}" />
+
+<Yl_HeadNav styleType="1" sort='{{content.sort}}' placeholder='搜索' bindonSearch="onSearch" />
+<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)'>
+    <van-tab title="全部" />
+    <van-tab title="新建" />
+    <van-tab title="提交" />
+    <van-tab title="审核" />
+    <van-tab title="完成" />
+</van-tabs>
+<view class="tips">
+    共计{{content.total}}单,合计¥{{amount}}
+</view>
+<Yl_ListBox id='ListBox' bind:getlist='getList'>
+    <List list="{{list}}" />
+</Yl_ListBox>

+ 5 - 0
packageA/orderForm/modules/list/index.js

@@ -0,0 +1,5 @@
+Component({
+  properties: {
+    list: Array
+  },
+})

+ 4 - 0
packageA/orderForm/modules/list/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

+ 75 - 0
packageA/orderForm/modules/list/index.scss

@@ -0,0 +1,75 @@
+.item {
+    width: 100vw;
+    padding-left: 30rpx;
+    box-sizing: border-box;
+    margin-bottom: 20rpx;
+    background-color: #ffffff;
+
+
+    .top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 80rpx;
+        width: 100%;
+        border-bottom: 1rpx solid #ddd;
+        box-sizing: border-box;
+        padding-right: 30rpx;
+
+        .tags {
+            text {
+                display: inline-block;
+                height: 40rpx;
+                line-height: 40rpx;
+                background: #E7EEFF;
+                border-radius: 20rpx;
+                padding: 0 15rpx;
+                font-size: 20rpx;
+                color: #3874F6;
+                margin-right: 10rpx;
+            }
+        }
+
+        .statu {
+            font-size: 28rpx;
+        }
+    }
+
+    .content {
+        position: relative;
+
+        .num {
+            height: 40rpx;
+            line-height: 40rpx;
+            font-size: 28rpx;
+            color: #333333;
+            padding: 20rpx 0;
+        }
+
+        .exp {
+            height: 34rpx;
+            font-size: 24rpx;
+            margin-bottom: 8rpx;
+            color: #999999;
+        }
+
+        .amount {
+            position: absolute;
+            font-size: 28rpx;
+            color: #FF3B30;
+            bottom: 0;
+            right: 30rpx;
+        }
+    }
+
+    .bottom {
+        height: 72rpx;
+        line-height: 72rpx;
+        margin-top: 12rpx;
+        border-top: 1rpx solid #ddd;
+        box-sizing: border-box;
+        padding-right: 30rpx;
+        font-size: 24rpx;
+        color: #666666;
+    }
+}

+ 53 - 0
packageA/orderForm/modules/list/index.wxml

@@ -0,0 +1,53 @@
+<navigator url="#" class="item" wx:for="{{list}}" wx:key="item.sonum">
+    <view class="top">
+        <view class="tags">
+            <text wx:if="{{item.type}}">{{item.type}}</text>
+            <text wx:if="{{item.brandname}}">{{item.brandname}}</text>
+            <text wx:if="{{item.tradefield}}">{{item.tradefield}}</text>
+        </view>
+        <view class="statu" style="color: {{set.color(item.status)}};">
+            {{item.status}}
+        </view>
+    </view>
+    <view class="content">
+        <view class="num">
+            订单号:{{item.sonum}}
+        </view>
+        <view class="exp">
+            区域经理:{{item.name}}
+        </view>
+        <view class="exp">
+            单据日期:{{item.createdate}}
+        </view>
+        <view class="exp">
+            共计{{item.qty}}件商品
+        </view>
+        <view class="amount">
+            合计:¥{{item.amount}}
+        </view>
+    </view>
+
+    <view class="bottom">
+        收货人信息
+    </view>
+</navigator>
+
+<wxs module="set">
+    module.exports = {
+        color: function (statu) {
+            var color = '#999999';
+            switch (statu) {
+                case "审核":
+                    color = '#FA8C16';
+                    break;
+                case "提交":
+                    color = '#52C41A';
+                    break;
+                case "新建":
+                    color = '#333333';
+                    break;
+            };
+            return color;
+        }
+    }
+</wxs>

+ 7 - 3
packageA/shopping/index.js

@@ -86,9 +86,12 @@ Page({
                 deteleList.push(i)
             }
         });
-        if (deteleList.length) deteleList.forEach(v => {
-            results.splice(v, 1);
-        });
+        if (deteleList.length) {
+            deteleList.forEach(v => {
+                results.splice(v, 1);
+            });
+            getApp().globalData.num = getApp().globalData.num - deteleList.length;
+        }
         wx.setStorageSync('shopping', {
             results,
             sa_brandid: this.data.sa_brandid
@@ -120,6 +123,7 @@ Page({
             if (this.data.results.some(v => v == item.sa_shoppingcartid)) this.changeResults({
                 item
             }, true);
+            getApp().globalData.num = getApp().globalData.num - 1;
         })
     },
     /* 步进器调整 */

+ 1 - 0
packageA/shopping/index.scss

@@ -98,6 +98,7 @@
     min-height: 130rpx;
     position: fixed;
     bottom: 0;
+    z-index: 999;
     display: flex;
     justify-content: space-between;
     padding: 0 30rpx;

+ 1 - 0
pages/home/index.wxml

@@ -9,4 +9,5 @@
 <view class="fun">
     <navigator url="/pages/base/index">列表模板</navigator>
     <navigator url="/packageA/market/index">商城</navigator>
+    <navigator url="/packageA/orderForm/index">销售订单</navigator>
 </view>