新增付费订单

pages/teams/addOrder.js

@@ -148,7 +148,7 @@ Page({
             pageTotal = res.pageTotal;
             this.setData({
                 userList: res.pageNumber == 1 ? res.data : this.data.userList.concat(res.data),
-                users: res.pageNumber == 1 ? [this.data.sys_payincidence == 1 ? (wx.getStorageSync('userMsg').userid + "") : (res.data[0].sa_agentsid + "" || "")] : this.data.users,
+                users: res.pageNumber == 1 ? [this.data.sys_payincidence == 1 ? (res.data[0].userid + "") : (res.data[0].sa_agentsid + "" || "")] : this.data.users,
             })
             pageNumber = res.pageNumber + 1;
             this.changeOrder();
@@ -187,6 +187,7 @@ Page({
                         "trade_type": "JSAPI"
                     }
                 }).then(res => {
+                    console.log(res)
                     wx.requestPayment({
                         timeStamp: res.data.timeStamp,
                         nonceStr: res.data.nonceStr,

pages/teams/index.js

@@ -1,160 +1,159 @@
 const _Http = getApp().globalData.http;
 const getHeight = require("../../utils/getRheRemainingHeight"),
-	currency = require("../../utils/currency");
+    currency = require("../../utils/currency");
 
 Page({
-	data: {
-		tabShow: true,
-		auth: {}, //权限
-		listHeight: 0,
-		butText: "", //按钮类型
-		content: {
-			nocache: true,
-			"pageNumber": 1,
-			"pageSize": 20,
-			"pageTotal": 1,
-			"where": {
-				"condition": ""
-			}
-		}
-	},
-	onLoad(options) {
-		let auth = options.auth ? JSON.parse(options.auth) : getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['个人中心'])[0].apps[0].meta.auth,
-			tabList = [],
-			authList = auth.map(v => {
-				if (v.option == 'account') {
-					tabList[0] = {
-						title: "账号列表",
-						butText: "新建账号",
-						classname: "sale.team.team",
-						method: "query_teamList",
-						url: '/pages/teams/addUsers'
-					}
-				} else if (v.option == 'role') {
-					tabList[1] = {
-						title: "角色列表",
-						butText: "新建角色",
-						classname: "sale.role.role",
-						method: "query_roleList",
-						url: '/pages/teams/addRole'
-					}
-				} else if (v.option == 'paidOrder') {
-					tabList[2] = {
-						title: "付费订单",
-						butText: "新建付费订单",
-						classname: "system.payorder.payorder",
-						method: "list",
-						url: "/pages/teams/addOrder"
-					}
-				}
-				return v.option
-			});
-		console.log(tabList)
-		this.setData({
-			authList,
-			tabList: tabList.filter(v => v),
-			active: tabList[0]
-		})
-		this.getList();
-	},
-	/* tab切换 */
-	tabChange(e) {
-		this.setData({
-			active: this.data.tabList[e.detail.index],
-			list: [],
-		})
-		this.getList(true);
-	},
-	/* 获取列表 */
-	getList(init = false) {
-		if (init.detail != undefined) init = init.detail;
-		if (init) this.setData({
-			['content.pageNumber']: 1
-		})
-		if (this.data.content.pageNumber > this.data.content.pageTotal) return;
-		let active = this.data.active;
-		_Http.basic({
-			classname: active.classname || '',
-			method: active.method || '',
-			id: active.id || '',
-			content: this.data.content
-		}).then(res => {
-			console.log(active.title, res)
-			this.selectComponent('#ListBox').RefreshToComplete();
-			if (res.msg != '成功') return wx.showToast({
-				title: res.msg,
-				icon: "none"
-			})
-			if (active.butText == '新建账号') {
-				for (let i = 0; i < res.data.length; i++) {
-					res.data[i].attinfos = res.data[i].attinfos.filter(v => v.usetype == 'headportrait');
-				}
-			} else if (active.butText == '新建付费订单') {
-				res.data = res.data.map(v => {
-					v.amount = currency(v.amount, {
-						symbol: "￥",
-						precision: 2
-					}).format();
-					return v
-				})
-			}
-			this.setData({
-				list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),
-				['content.pageNumber']: res.pageNumber + 1,
-				['content.pageTotal']: res.pageTotal
-			})
-		})
-	},
-	/* 新建账号/角色 */
-	newItem() {
-		let url = this.data.active.url;
-		if (!url) return;
-		if (url == '/pages/teams/addOrder') {
-			_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: url + '?sys_payorderid=' + res.data.sys_payorderid
-				})
-			})
-		} else {
-			wx.navigateTo({
-				url
-			})
-		}
-	},
-	/* 修改角色 */
-	changeRole(e) {
-		let {
-			item
-		} = e.currentTarget.dataset;
-		wx.navigateTo({
-			url: `./addRole?item=${JSON.stringify(item)}&update=${this.data.authList.includes("角色修改")}&userDelete=${this.data.authList.includes("角色删除")}`
-		})
-	},
-	/* 修改账号 */
-	changeUser(e) {
-		let {
-			item
-		} = e.currentTarget.dataset;
-		delete(item.attinfos);
-		wx.navigateTo({
-			url: `./addUsers?item=${JSON.stringify(item)}&update=${this.data.authList.includes("账号修改")}`
-		})
-	},
-	onReady() {
-		getHeight.getHeight('.tabs', this).then(res => {
-			this.setData({
-				listHeight: res
-			})
-		});
-	},
+    data: {
+        tabShow: true,
+        auth: {}, //权限
+        listHeight: 0,
+        butText: "", //按钮类型
+        content: {
+            nocache: true,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "pageTotal": 1,
+            "where": {
+                "condition": ""
+            }
+        }
+    },
+    onLoad(options) {
+        let auth = options.auth ? JSON.parse(options.auth) : getApp().globalData.queryPer.query(wx.getStorageSync('userauth'), ['通用'], ['个人中心'])[0].apps[0].meta.auth,
+            tabList = [],
+            authList = auth.map(v => {
+                if (v.option == 'account') {
+                    tabList[0] = {
+                        title: "账号列表",
+                        butText: "新建账号",
+                        classname: "sale.team.team",
+                        method: "query_teamList",
+                        url: '/pages/teams/addUsers'
+                    }
+                } else if (v.option == 'role') {
+                    tabList[1] = {
+                        title: "角色列表",
+                        butText: "新建角色",
+                        classname: "sale.role.role",
+                        method: "query_roleList",
+                        url: '/pages/teams/addRole'
+                    }
+                } else if (v.option == 'paidOrder') {
+                    tabList[2] = {
+                        title: "付费订单",
+                        butText: wx.getStorageSync('siteP').sys_payswitch ? "新建付费订单" : "",
+                        classname: "system.payorder.payorder",
+                        method: "list",
+                        url: "/pages/teams/addOrder"
+                    }
+                }
+                return v.option
+            });
+        this.setData({
+            authList,
+            tabList: tabList.filter(v => v),
+            active: tabList[0]
+        })
+        this.getList();
+    },
+    /* tab切换 */
+    tabChange(e) {
+        this.setData({
+            active: this.data.tabList[e.detail.index],
+            list: [],
+        })
+        this.getList(true);
+    },
+    /* 获取列表 */
+    getList(init = false) {
+        if (init.detail != undefined) init = init.detail;
+        if (init) this.setData({
+            ['content.pageNumber']: 1
+        })
+        if (this.data.content.pageNumber > this.data.content.pageTotal) return;
+        let active = this.data.active;
+        _Http.basic({
+            classname: active.classname || '',
+            method: active.method || '',
+            id: active.id || '',
+            content: this.data.content
+        }).then(res => {
+            console.log(active.title, res)
+            this.selectComponent('#ListBox').RefreshToComplete();
+            if (res.msg != '成功') return wx.showToast({
+                title: res.msg,
+                icon: "none"
+            })
+            if (active.butText == '新建账号') {
+                for (let i = 0; i < res.data.length; i++) {
+                    res.data[i].attinfos = res.data[i].attinfos.filter(v => v.usetype == 'headportrait');
+                }
+            } else if (active.butText == '新建付费订单') {
+                res.data = res.data.map(v => {
+                    v.amount = currency(v.amount, {
+                        symbol: "￥",
+                        precision: 2
+                    }).format();
+                    return v
+                })
+            }
+            this.setData({
+                list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),
+                ['content.pageNumber']: res.pageNumber + 1,
+                ['content.pageTotal']: res.pageTotal
+            })
+        })
+    },
+    /* 新建账号/角色 */
+    newItem() {
+        let url = this.data.active.url;
+        if (!url) return;
+        if (url == '/pages/teams/addOrder') {
+            _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: url + '?sys_payorderid=' + res.data.sys_payorderid
+                })
+            })
+        } else {
+            wx.navigateTo({
+                url
+            })
+        }
+    },
+    /* 修改角色 */
+    changeRole(e) {
+        let {
+            item
+        } = e.currentTarget.dataset;
+        wx.navigateTo({
+            url: `./addRole?item=${JSON.stringify(item)}&update=${this.data.authList.includes("角色修改")}&userDelete=${this.data.authList.includes("角色删除")}`
+        })
+    },
+    /* 修改账号 */
+    changeUser(e) {
+        let {
+            item
+        } = e.currentTarget.dataset;
+        delete(item.attinfos);
+        wx.navigateTo({
+            url: `./addUsers?item=${JSON.stringify(item)}&update=${this.data.authList.includes("账号修改")}`
+        })
+    },
+    onReady() {
+        getHeight.getHeight('.tabs', this).then(res => {
+            this.setData({
+                listHeight: res
+            })
+        });
+    },
 })

pages/teams/order.js

@@ -9,12 +9,14 @@ let sys_payorderid = null,
     }).format();
 
 Page({
-    data: {},
+    data: {
+    },
     onLoad(options) {
         sys_payorderid = options.id;
         // sys_payincidence 1账号 2主体
         this.setData({
-            sys_payincidence: wx.getStorageSync('siteP').sys_payincidence
+            sys_payincidence: wx.getStorageSync('siteP').sys_payincidence,
+            sys_payswitch: wx.getStorageSync('siteP').sys_payswitch
         })
         this.getDetail();
         this.getList(true);
@@ -72,8 +74,8 @@ Page({
                 }]
             });
         })
-	},
-	/* 获取列表 */
+    },
+    /* 获取列表 */
     getList(init = false) {
         if (init) {
             pageNumber = 1;
@@ -109,7 +111,7 @@ Page({
             })
             this.setData({
                 list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-                
+
                 total: res.total
             })
         })
@@ -184,14 +186,14 @@ Page({
                 })
             }
         })
-	},
-	/* 查看版本 */
-	viewDetails(){
-		this.selectComponent("#inventory").show(this.data.detail.systemapp)
-	},
+    },
+    /* 查看版本 */
+    viewDetails() {
+        this.selectComponent("#inventory").show(this.data.detail.systemapp)
+    },
     onReachBottom() {
         this.getList();
-	},
+    },
     onUnload() {
         let page = getCurrentPages().find(v => v.__route__ == 'pages/teams/index');
         if (!page) return;

pages/teams/order.wxml

@@ -38,7 +38,7 @@
         </view>
         <view class="but-box">
             <van-button custom-class='but delete' bind:click="deleteOrder">删除订单</van-button>
-            <van-button custom-class='but' bind:click="payment">继续支付</van-button>
+            <van-button custom-class='but' wx:if="{{sys_payswitch}}" bind:click="payment">继续支付</van-button>
         </view>
     </view>
 </block>