付费订单

pages/teams/addOrder.js

@@ -20,10 +20,12 @@ Page({
     onLoad(options) {
         this.setData({
             sys_payinstructions: wx.getStorageSync('siteP').sys_payinstructions,
-            sys_payincidence: 1
+            sys_payincidence: 1,
+            opUsers: options.users ? JSON.parse(options.users) : []
         })
         sys_payorderid = options.sys_payorderid;
-        this.getVersions();
+        console.log(options)
+        this.getVersions(options.vid || "");
     },
     /* 保存订单进度 */
     changeOrder() {
@@ -70,7 +72,7 @@ Page({
         this.changeOrder();
     },
     /* 获取版本 */
-    getVersions() {
+    getVersions(vid) {
         _Http.basic({
             "classname": "system.payorder.payorder",
             "method": "chooseSystemPartition",
@@ -94,9 +96,11 @@ Page({
                 }, 1000)
                 return;
             };
+            let sys_site_systempartitionid = res.data[0].sys_site_systempartitionid || '';
+            if (vid && res.data.some(v => v.sys_site_systempartitionid == vid)) sys_site_systempartitionid = vid - 0;
             this.setData({
                 versionsList: res.data,
-                sys_site_systempartitionid: res.data[0].sys_site_systempartitionid || ''
+                sys_site_systempartitionid
             })
             this.getUsers(true);
         })
@@ -149,27 +153,25 @@ Page({
                 return;
             };
             pageTotal = res.pageTotal;
+
             this.setData({
                 userList: res.pageNumber == 1 ? res.data : this.data.userList.concat(res.data)
             })
             pageNumber = res.pageNumber + 1;
-            this.setUsers();
+            this.setUsers(this.data.opUsers.filter(id => this.data.userList.some(v => id == v.userid)));
             this.changeOrder();
         })
     },
-    setUsers() {
-        let users = [],
-            list = this.data.userList,
+    setUsers(users = []) {
+        let list = this.data.userList,
             idname = this.data.sys_payincidence == 1 ? 'userid' : 'sa_agentsid'
         list.forEach(v => {
-            if (v.userid == wx.getStorageSync('userMsg').userid) {
-                users.push(v[idname] + '');
-            } else if (v.isleader == 1) {
-                let date = v.enddate[this.data.sys_site_systempartitionid];
+            let date = v.enddate[this.data.sys_site_systempartitionid];
+            if (v.userid == wx.getStorageSync('userMsg').userid || v.isleader == 1) {
                 if (date) {
-                    if (formatTime(new Date(), '-').split(" ")[0] >= date) users.push(v[idname] + '');
+                    // if (formatTime(new Date(), '-').split(" ")[0] >= date) users.push(v[idname] + '');
                 } else {
-                    users.push(v[idname] + '');
+                    if (!users.some(v => v == v[idname])) users.push(v[idname] + '');
                 }
             }
         });

pages/teams/addOrder.scss

@@ -67,6 +67,9 @@
     align-items: center;
 
     .content {
+        position: relative;
+        width: 100%;
+
         .label {
             font-size: 30rpx;
             font-family: PingFang SC-Bold, PingFang SC;
@@ -81,6 +84,22 @@
             color: #666666;
             margin-top: 8rpx;
         }
+
+        .tag {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100rpx;
+            height: 45rpx;
+            font-size: 30rpx;
+            border: 1px solid red;
+            position: absolute;
+            color: red;
+            right: 0;
+            top: 50%;
+            margin-top: -22.5rpx;
+            border-radius: 4rpx;
+        }
     }
 }
 

pages/teams/addOrder.wxml

@@ -29,6 +29,9 @@
             <view>
                 到期时间:{{item.enddate[sys_site_systempartitionid]||' --'}}
             </view>
+            <view class="tag" wx:if="{{!item.enddate[sys_site_systempartitionid]}}">
+                未付费
+            </view>
         </view>
     </view>
 </van-checkbox-group>

pages/teams/addUsers.js

@@ -57,9 +57,22 @@ Page({
         disabled: true, //按钮禁用
         loading: false, //按钮加载
     },
-    toOrder(){
-        wx.navigateTo({
-          url: './addOrder',
+    toOrder() {
+
+        _Http.basic({
+            "classname": "system.payorder.payorder",
+            "method": "createOrder",
+            "content": {},
+        }).then(res => {
+            console.log("新建订单", res)
+            if (res.msg != '成功') return wx.showToast({
+                title: res.msg,
+                icon: "none",
+                mask: true
+            });
+            wx.navigateTo({
+                url: './addOrder' + '?sys_payorderid=' + res.data.sys_payorderid,
+            })
         })
     },
     onLoad(options) {
@@ -89,7 +102,7 @@ Page({
                 "sa_agent_hrid": this.data.sa_agent_hrid
             }
         }).then(res => {
-            console.log("角色列表",res)
+            console.log("角色列表", res)
             if (res.msg != '成功') return wx.showToast({
                 title: res.msg,
                 icon: "none"

pages/teams/index.js

@@ -55,11 +55,11 @@ Page({
             tabList: tabList.filter(v => v),
             active: tabList[options.title ? tabList.findIndex(v => v.title == options.title) || 0 : 0]
         })
-      /*   if (options.title) setTimeout(() => {
-            this.setData({
-                active: this.data.active
-            })
-        }, 300) */
+        /*   if (options.title) setTimeout(() => {
+              this.setData({
+                  active: this.data.active
+              })
+          }, 300) */
         this.getList();
     },
     /* tab切换 */
@@ -96,6 +96,28 @@ Page({
                 }
             } else if (active.butText == '新建付费订单') {
                 res.data = res.data.map(v => {
+                    switch (v.ispaid) {
+                        case 0:
+                            v.color = "#FF3B30";
+                            v.status = '未付费';
+                            break;
+                        case 1:
+                            v.color = '#52C41A';
+                            v.status = '已付费';
+                            break;
+                        case 2:
+                            v.color = '#ddd';
+                            v.status = "新建";
+                            break;
+                        case 3:
+                            v.color = '#ddd';
+                            v.status = "已取消";
+                            break;
+                        case 4:
+                            v.color = '#ddd';
+                            v.status = "已退费";
+                            break;
+                    };
                     v.amount = currency(v.amount, {
                         symbol: "￥",
                         precision: 2

pages/teams/index.wxml

@@ -57,7 +57,7 @@
             <view>
                 备注：{{item.remarks || " --"}}
             </view>
-            <text class="status" style="background-color: {{item.ispaid==1?'#52C41A':item.ispaid==0?'#FF3B30':'#ddd'}};">{{item.ispaid==1?'已付费':item.ispaid==0?'未付费':"已取消"}}</text>
+            <text class="status" style="background-color: {{item.color}};">{{item.status}}</text>
         </navigator>
     </block>
     <view style="height: 230rpx;" />

pages/teams/order.js

@@ -43,6 +43,28 @@ Page({
             };
             let detail = res.data;
             detail.showAmount = CNY(detail.amount);
+            switch (detail.ispaid) {
+                case 0:
+                    detail.color = "#FF3B30";
+                    detail.status = '未付费';
+                    break;
+                case 1:
+                    detail.color = '#52C41A';
+                    detail.status = '已付费';
+                    break;
+                case 2:
+                    detail.color = '#ddd';
+                    detail.status = "新建";
+                    break;
+                case 3:
+                    detail.color = '#ddd';
+                    detail.status = "已取消";
+                    break;
+                case 4:
+                    detail.color = '#ddd';
+                    detail.status = "已退费";
+                    break;
+            };
             this.setData({
                 detail,
                 showroom: [{
@@ -50,8 +72,8 @@ Page({
                     value: detail.orderno
                 }, {
                     label: "付费状态",
-                    value: detail.ispaid == 1 ? '已付费' : detail.ispaid == 0 ? '未付费' : '已取消',
-                    color: detail.ispaid == 1 ? '#52C41A' : detail.ispaid == 0 ? '#FF3B30' : '#ddd',
+                    value: detail.status,
+                    color: detail.color,
                 }, {
                     label: "付费金额",
                     value: detail.showAmount,

pages/teams/order.wxml

@@ -1,45 +1,43 @@
 <import src="order.skeleton.wxml" />
 <template is="skeleton" wx:if="{{loading}}" />
+<navigator url="#" class="row" wx:for="{{showroom}}" wx:key="lebel" bindtap="{{item.func||''}}">
+    <view>
+        <view class="lebel">{{item.label}}</view>
+        <view class="text" style="color: {{item.color||'#333333'}};">{{item.value||' --'}}</view>
+    </view>
+</navigator>
+<view class="title">
+    付费订单列表
+</view>
+<block wx:if="{{sys_payincidence==1}}" wx:key="index">
+    <view class="card" wx:for="{{list}}">
+        <view class="label">账号名称：{{item.name}}</view>
+        <view>账号：{{item.accountno}}</view>
+        <view>单价（元）：<text class="price">{{item.price}}</text></view>
+        <view>生效时间：{{item.begdate}}</view>
+        <view>到期时间：{{item.enddate}}</view>
+    </view>
+</block>
 <block wx:else>
-    <navigator url="#" class="row" wx:for="{{showroom}}" wx:key="lebel" bindtap="{{item.func||''}}">
-        <view>
-            <view class="lebel">{{item.label}}</view>
-            <view class="text" style="color: {{item.color||'#333333'}};">{{item.value||' --'}}</view>
-        </view>
-    </navigator>
-    <view class="title">
-        付费订单列表
+    <view class="card" wx:for="{{list}}" wx:key="index">
+        <view class="label">{{item.agentname}}</view>
+        <view>单价（元）：<text class="price">{{item.price}}</text></view>
+        <view>生效时间：{{item.begdate}}</view>
+        <view>到期时间：{{item.enddate}}</view>
     </view>
-    <block wx:if="{{sys_payincidence==1}}" wx:key="index">
-        <view class="card" wx:for="{{list}}">
-            <view class="label">账号名称：{{item.name}}</view>
-            <view>账号：{{item.accountno}}</view>
-            <view>单价（元）：<text class="price">{{item.price}}</text></view>
-            <view>生效时间：{{item.begdate}}</view>
-            <view>到期时间：{{item.enddate}}</view>
-        </view>
-    </block>
-    <block wx:else>
-        <view class="card" wx:for="{{list}}" wx:key="index">
-            <view class="label">{{item.agentname}}</view>
-            <view>单价（元）：<text class="price">{{item.price}}</text></view>
-            <view>生效时间：{{item.begdate}}</view>
-            <view>到期时间：{{item.enddate}}</view>
-        </view>
-    </block>
-    <block wx:if="{{detail.ispaid!=1}}">
-        <view style="height: 130rpx;" />
-        <view class="footer">
-            <view class="left">
-                <view>
-                    总价：<text class="price">{{detail.showAmount}}</text>
-                </view>
-            </view>
-            <view class="but-box">
-                <van-button custom-class='but delete' bind:click="deleteOrder">删除订单</van-button>
-                <van-button custom-class='but' wx:if="{{sys_payswitch && detail.ispaid==0}}" bind:click="payment">继续支付</van-button>
+</block>
+<block wx:if="{{detail.ispaid!=1}}">
+    <view style="height: 130rpx;" />
+    <view class="footer">
+        <view class="left">
+            <view>
+                总价：<text class="price">{{detail.showAmount}}</text>
             </view>
         </view>
-    </block>
-    <inventory id='inventory' />
-</block>
+        <view class="but-box">
+            <van-button custom-class='but delete' bind:click="deleteOrder">删除订单</van-button>
+            <van-button custom-class='but' wx:if="{{sys_payswitch && detail.ispaid==0}}" bind:click="payment">继续支付</van-button>
+        </view>
+    </view>
+</block>
+<inventory id='inventory' />