修改小程序

config.js

@@ -9,7 +9,7 @@ if (system.uniPlatform == 'mp-weixin') {
 }
 export default {
 	serverFile: 'https://broadcast.waityou24.cn',
-	serverUrl: 'http://192.168.1.113:13004',
+	serverUrl: 'http://192.168.3.15:13004',
 	wx_projectkey: wx_projectkey,
 	wx_miniProgram: wx_min.miniProgram,
 	system: system,
@@ -37,8 +37,8 @@ export default {
 		},
 		{
 			icon: "icon-transaction",
-			title: "待回款",
-			status: "7",
+			title: "收货成功",
+			status: "6",
 			type: "order",
 			route: "pagesMy/order/index",
 		},

pages.json

@@ -104,14 +104,14 @@
 				{
 					"path": "buyExamine/index",
 					"style": {
-						"navigationBarTitleText": "采购审核",
+						"navigationBarTitleText": "采购审批",
 						"enablePullDownRefresh": true
 					}
 				},
 				{
 					"path": "collectionExamin/index",
 					"style": {
-						"navigationBarTitleText": "回款审核",
+						"navigationBarTitleText": "回款审批",
 						"enablePullDownRefresh": true
 					}
 				},

pagesGoods/index/index.vue

@@ -53,9 +53,11 @@
 								<view class="one">
 									<view class="one_1">
 										<view class="l">
-											<image class="image"
-												:src="specsInfo&&specsInfo.file.length>0?specsInfo.file[0].url:''"
-												mode="aspectFill"></image>
+											<image v-if="specsInfo.file" class="image"
+												:src="specsInfo.file?specsInfo.file[0].url:''" mode="">
+											</image>
+											<image v-else class="image" :src="info.file?info.file[0].url:''" mode="">
+											</image>
 										</view>
 										<view class="r">
 											<view class="money">
@@ -436,7 +438,7 @@
 					.one_1 {
 						display: flex;
 						margin: 0 0 2vw 0;
-						padding: 0 0 2vw 0;
+						padding: 0 0 2vw 2vw;
 						border-bottom: 0.5vw solid var(--f9Color);
 
 						.l {

pagesMy/buyExamine/index.vue

@@ -49,8 +49,8 @@
 							</view>
 						</view>
 						<view class="bottom">
-							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
-							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审核拒绝</button>
+							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审批通过</button>
+							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审批拒绝</button>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
@@ -217,7 +217,7 @@
 				that.clearPage();
 				that.search();
 			},
-			// 审核
+			// 审批
 			async toExam(item, type) {
 				const that = this;
 				let user = that.user;
@@ -231,7 +231,7 @@
 				}
 				uni.showModal({
 					title: '提示',
-					content: '确定审核该订单吗?',
+					content: '确定审批该订单吗?',
 					success: async function(res) {
 						if (res.confirm) {
 							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);

pagesMy/collectionExamin/index.vue

@@ -49,8 +49,8 @@
 							</view>
 						</view>
 						<view class="bottom">
-							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
-							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审核拒绝</button>
+							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审批通过</button>
+							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审批拒绝</button>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
@@ -137,10 +137,10 @@
 					limit: that.limit,
 				};
 				if (user.role == 'kj') {
-					info.status = '7';
+					info.status = '6';
 					info.accounting = user._id;
-				} else if (user.role == 'ld') {
-					info.status = '8';
+				} else {
+					info.status = '7';
 					info.leader = user._id;
 				}
 				let res;
@@ -183,41 +183,6 @@
 					else return '暂无'
 				}
 			},
-			// 审核
-			async toExam(item, type) {
-				const that = this;
-				let user = that.user;
-				let obj = {}
-				if (type == '0') {
-					if (user.role == 'kj') obj.status = '8';
-					else obj.status = '9';
-				} else {
-					if (user.role == 'kj') obj.status = '-9';
-					else obj.status = '-9';
-				}
-				uni.showModal({
-					title: '提示',
-					content: '确定审核该订单吗?',
-					success: async function(res) {
-						if (res.confirm) {
-							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
-							if (res.errcode == '0') {
-								uni.showToast({
-									title: '维护信息成功',
-									icon: 'none'
-								})
-								that.clearPage()
-								that.search()
-							} else {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none'
-								})
-							}
-						}
-					}
-				});
-			},
 			// 分页
 			toPage(e) {
 				const that = this;
@@ -252,14 +217,48 @@
 				that.clearPage();
 				that.search();
 			},
+			// 审批
+			async toExam(item, type) {
+				const that = this;
+				let user = that.user;
+				let obj = {};
+				if (type == '0') {
+					if (user.role == 'kj') obj.status = '7';
+					else obj.status = '8';
+				} else {
+					if (user.role == 'kj') obj.status = '-7';
+					else obj.status = '-8';
+				}
+				uni.showModal({
+					title: '提示',
+					content: '确定审批该订单吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
 			// 查询其他信息
 			async searchOther() {
 				const that = this;
 				let res;
 				// 查询状态
 				res = await that.$api(`/DictData`, 'GET', {
-					type: 'order_status',
-					is_use: '0',
+					type: 'order_status'
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 				// 查询角色
@@ -315,7 +314,7 @@
 					justify-content: space-between;
 					padding: 2vw 0;
 					font-size: var(--font16Size);
-
+				
 					.status {
 						font-size: var(--font14Size);
 						color: var(--fF0Color);
@@ -361,7 +360,7 @@
 
 						.right_2 {
 							font-size: var(--font12Size);
-
+						
 							.spec {
 								text:first-child {
 									color: var(--f85Color);

pagesMy/record/index.vue

@@ -1,37 +1,397 @@
-<template>
-	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: '回款记录'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-</style>
+<template>
+	<view class="content">
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="list" v-for="(item,index) in list" :key="index" @tap="toInfo(item)">
+						<view class="list_1">
+							<text>
+								<text class="iconfont icon-changshangguanli"></text>
+								{{item.supplier_name}}
+							</text>
+							<text class="status">{{item.zhStatus}}</text>
+						</view>
+						<view class="list_2">
+							<view class="left">
+								<image v-if="item.spec_file" class="image" :src="item.spec_file?item.spec_file.url:''"
+									mode="">
+								</image>
+								<image v-else class="image" :src="item.good_file?item.good_file.url:''" mode="">
+								</image>
+							</view>
+							<view class="right">
+								<view class="right_1">
+									<view class="name textOver">
+										<text>{{item.good_name||'暂无'}}</text>
+									</view>
+									<view class="num">
+										<text>￥{{item.total_money||'0'}}</text>
+										<text>×{{item.num||'0'}}</text>
+									</view>
+								</view>
+								<view class="right_2">
+									<view class="spec textOver">
+										<text>规格：</text>
+										<text>{{item.spec_name||'暂无'}}</text>
+									</view>
+									<view class="spec textOver">
+										<text>购买用户：</text>
+										<text>{{item.user_name||'暂无'}}</text>
+									</view>
+									<view class="spec textOver">
+										<text>用户角色：</text>
+										<text>{{item.zhRole||'暂无'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="bottom" v-if="item.status=='-7'||item.status=='-8'">
+							<button size="mini" type="default" @tap.stop="toExam(item)">重新申请回款</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 系统设置
+				config: {},
+				user: {},
+				searchInfo: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
+				roleList: []
+			}
+		},
+		onLoad: function(e) {
+			const that = this;
+			that.searchConfig();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchOther();
+			that.searchToken();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+						that.clearPage();
+						that.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					supplier: user._id,
+				};
+				let res;
+				res = await that.$api(`/OrderDetail/money`, 'GET', {
+					...info,
+					...that.searchInfo
+				});
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						val.zhStatus = that.searchDict(val.status, 'status')
+						val.zhRole = that.searchDict(val.user_role, 'role')
+					}
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			// 查看详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesMy/order/detail?id=${e.id||e._id}`
+				})
+			},
+			// 查询字典表
+			searchDict(e, model) {
+				const that = this;
+				let data
+				if (model == 'status') {
+					data = that.statusList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else if (model == 'role') {
+					data = that.roleList.find((i) => i.code == e);
+					if (data) return data.name
+					else return '暂无'
+				}
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			// 触底
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 审批
+			async toExam(item) {
+				const that = this;
+				let user = that.user;
+				let obj = {
+					status: '6'
+				};
+				uni.showModal({
+					title: '提示',
+					content: '确定重新申请该订单吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'order_status'
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+				// 查询角色
+				res = await that.$api(`/Role`, 'GET', {
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `roleList`, res.data);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			padding: 2vw;
+
+			input {
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+
+			.list {
+				background-color: #fff;
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw 0;
+					font-size: var(--font16Size);
+
+					.status {
+						font-size: var(--font14Size);
+						color: var(--fF0Color);
+					}
+				}
+
+				.list_2 {
+					display: flex;
+
+					.left {
+						.image {
+							width: 20vw;
+							height: 20vw;
+							border-radius: 5px;
+							border: 1px solid var(--f9Color);
+						}
+					}
+
+					.right {
+						width: 70vw;
+						margin: 0 0 0 2vw;
+
+						.right_1 {
+							display: flex;
+							justify-content: space-between;
+							margin: 2vw 0;
+
+							.name {
+								font-size: var(--font14Size);
+							}
+
+							.num {
+								display: flex;
+								flex-direction: column;
+								align-items: flex-end;
+
+								text:last-child {
+									font-size: var(--font13Size);
+									color: var(--f85Color);
+								}
+							}
+						}
+
+						.right_2 {
+							font-size: var(--font12Size);
+
+							.spec {
+								text:first-child {
+									color: var(--f85Color);
+								}
+							}
+						}
+					}
+				}
+
+				.bottom {
+					text-align: center;
+					padding: 1vw 0;
+
+					button {
+						margin: 0 5px 0 0;
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

pagesMy/user/index.vue

@@ -39,8 +39,8 @@
 									</view>
 								</view>
 								<view class="bottom" v-if="item.status=='0'">
-									<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
-									<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审核拒绝</button>
+									<button size="mini" type="default" @tap.stop="toExam(item,'0')">审批通过</button>
+									<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审批拒绝</button>
 								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
@@ -202,7 +202,7 @@
 				else obj.status == '2'
 				uni.showModal({
 					title: '提示',
-					content: '是否要确认审核?',
+					content: '是否要确认审批?',
 					success: async function(res) {
 						if (res.confirm) {
 							const res = await that.$api(`/User/${item._id}`, 'POST', obj);

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -17978,13 +17978,13 @@ var _default = {
     }, {
       "path": "buyExamine/index",
       "style": {
-        "navigationBarTitleText": "采购审核",
+        "navigationBarTitleText": "采购审批",
         "enablePullDownRefresh": true
       }
     }, {
       "path": "collectionExamin/index",
       "style": {
-        "navigationBarTitleText": "回款审核",
+        "navigationBarTitleText": "回款审批",
         "enablePullDownRefresh": true
       }
     }, {
@@ -19967,7 +19967,7 @@ if (system.uniPlatform == 'mp-weixin') {
 }
 var _default = {
   serverFile: 'https://broadcast.waityou24.cn',
-  serverUrl: 'http://192.168.1.113:13004',
+  serverUrl: 'http://192.168.3.15:13004',
   wx_projectkey: wx_projectkey,
   wx_miniProgram: wx_min.miniProgram,
   system: system,
@@ -19992,8 +19992,8 @@ var _default = {
     route: "pagesMy/order/index"
   }, {
     icon: "icon-transaction",
-    title: "待回款",
-    status: "7",
+    title: "收货成功",
+    status: "6",
     type: "order",
     route: "pagesMy/order/index"
   }, {

unpackage/dist/dev/mp-weixin/pagesGoods/index/index.js

@@ -131,16 +131,6 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var g0 =
-    _vm.popupShow == "1" ? _vm.specsInfo && _vm.specsInfo.file.length > 0 : null
-  _vm.$mp.data = Object.assign(
-    {},
-    {
-      $root: {
-        g0: g0,
-      },
-    }
-  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -293,6 +283,8 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {

unpackage/dist/dev/mp-weixin/pagesGoods/index/index.wxss

@@ -115,7 +115,7 @@
 .popup .specs_1 .info_1 .one .one_1 {
   display: flex;
   margin: 0 0 2vw 0;
-  padding: 0 0 2vw 0;
+  padding: 0 0 2vw 2vw;
   border-bottom: 0.5vw solid var(--f9Color);
 }
 .popup .specs_1 .info_1 .one .one_1 .l {

unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js

@@ -429,7 +429,7 @@ var _default = {
       that.clearPage();
       that.search();
     },
-    // 审核
+    // 审批
     toExam: function toExam(item, type) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
@@ -448,7 +448,7 @@ var _default = {
                 }
                 uni.showModal({
                   title: '提示',
-                  content: '确定审核该订单吗?',
+                  content: '确定审批该订单吗?',
                   success: function () {
                     var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
                       var _res;

unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "采购审核",
+  "navigationBarTitleText": "采购审批",
   "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js

@@ -334,10 +334,10 @@ var _default = {
                   limit: that.limit
                 };
                 if (user.role == 'kj') {
-                  info.status = '7';
+                  info.status = '6';
                   info.accounting = user._id;
-                } else if (user.role == 'ld') {
-                  info.status = '8';
+                } else {
+                  info.status = '7';
                   info.leader = user._id;
                 }
                 _context3.next = 6;
@@ -396,7 +396,40 @@ var _default = {
         if (data) return data.name;else return '暂无';
       }
     },
-    // 审核
+    // 分页
+    toPage: function toPage(e) {
+      var that = this;
+      var list = that.list;
+      var limit = that.limit;
+      if (that.total > list.length) {
+        uni.showLoading({
+          title: '加载中',
+          mask: true
+        });
+        var page = that.page + 1;
+        that.$set(that, "page", page);
+        var skip = page * limit;
+        that.$set(that, "skip", skip);
+        that.search();
+        uni.hideLoading();
+      } else that.$set(that, "is_bottom", true);
+    },
+    // 触底
+    toScroll: function toScroll(e) {
+      var that = this;
+      var up = that.scrollTop;
+      that.$set(that, "scrollTop", e.detail.scrollTop);
+      var num = Math.sign(up - e.detail.scrollTop);
+      if (num == 1) that.$set(that, "is_bottom", false);
+    },
+    // 输入框
+    toInput: function toInput(e) {
+      var that = this;
+      if (that.searchInfo.goods) that.$set(that.searchInfo, "goods", e.detail.value);else that.$set(that, "searchInfo", {});
+      that.clearPage();
+      that.search();
+    },
+    // 审批
     toExam: function toExam(item, type) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
@@ -409,13 +442,13 @@ var _default = {
                 user = that.user;
                 obj = {};
                 if (type == '0') {
-                  if (user.role == 'kj') obj.status = '8';else obj.status = '9';
+                  if (user.role == 'kj') obj.status = '7';else obj.status = '8';
                 } else {
-                  if (user.role == 'kj') obj.status = '-9';else obj.status = '-9';
+                  if (user.role == 'kj') obj.status = '-7';else obj.status = '-8';
                 }
                 uni.showModal({
                   title: '提示',
-                  content: '确定审核该订单吗?',
+                  content: '确定审批该订单吗?',
                   success: function () {
                     var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
                       var _res;
@@ -465,39 +498,6 @@ var _default = {
         }, _callee5);
       }))();
     },
-    // 分页
-    toPage: function toPage(e) {
-      var that = this;
-      var list = that.list;
-      var limit = that.limit;
-      if (that.total > list.length) {
-        uni.showLoading({
-          title: '加载中',
-          mask: true
-        });
-        var page = that.page + 1;
-        that.$set(that, "page", page);
-        var skip = page * limit;
-        that.$set(that, "skip", skip);
-        that.search();
-        uni.hideLoading();
-      } else that.$set(that, "is_bottom", true);
-    },
-    // 触底
-    toScroll: function toScroll(e) {
-      var that = this;
-      var up = that.scrollTop;
-      that.$set(that, "scrollTop", e.detail.scrollTop);
-      var num = Math.sign(up - e.detail.scrollTop);
-      if (num == 1) that.$set(that, "is_bottom", false);
-    },
-    // 输入框
-    toInput: function toInput(e) {
-      var that = this;
-      if (that.searchInfo.goods) that.$set(that.searchInfo, "goods", e.detail.value);else that.$set(that, "searchInfo", {});
-      that.clearPage();
-      that.search();
-    },
     // 查询其他信息
     searchOther: function searchOther() {
       var _this3 = this;
@@ -510,8 +510,7 @@ var _default = {
                 that = _this3;
                 _context6.next = 3;
                 return that.$api("/DictData", 'GET', {
-                  type: 'order_status',
-                  is_use: '0'
+                  type: 'order_status'
                 });
               case 3:
                 res = _context6.sent;

unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "回款审核",
+  "navigationBarTitleText": "回款审批",
   "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pagesMy/record/index.wxss

@@ -1,12 +1,105 @@
-
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
 .content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  padding: 2vw;
+}
+.content .one input {
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+}
+.content .two .list {
+  background-color: #fff;
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.content .two .list .list_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+}
+.content .two .list .list_1 .status {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.content .two .list .list_2 {
+  display: flex;
+}
+.content .two .list .list_2 .left .image {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 5px;
+  border: 1px solid var(--f9Color);
+}
+.content .two .list .list_2 .right {
+  width: 70vw;
+  margin: 0 0 0 2vw;
+}
+.content .two .list .list_2 .right .right_1 {
+  display: flex;
+  justify-content: space-between;
+  margin: 2vw 0;
+}
+.content .two .list .list_2 .right .right_1 .name {
+  font-size: var(--font14Size);
+}
+.content .two .list .list_2 .right .right_1 .num {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.content .two .list .list_2 .right .right_1 .num text:last-child {
+  font-size: var(--font13Size);
+  color: var(--f85Color);
+}
+.content .two .list .list_2 .right .right_2 {
+  font-size: var(--font12Size);
+}
+.content .two .list .list_2 .right .right_2 .spec text:first-child {
+  color: var(--f85Color);
+}
+.content .two .list .bottom {
+  text-align: center;
+  padding: 1vw 0;
+}
+.content .two .list .bottom button {
+  margin: 0 5px 0 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
 }
 

unpackage/dist/dev/mp-weixin/pagesMy/user/index.js

@@ -372,7 +372,7 @@ var _default = {
                 if (type == '0') obj.status == '1';else obj.status == '2';
                 uni.showModal({
                   title: '提示',
-                  content: '是否要确认审核?',
+                  content: '是否要确认审批?',
                   success: function () {
                     var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
                       var _res;

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,7 +2,7 @@
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "test",
   "setting": {
-    "compileHotReLoad": true
+    "compileHotReLoad": false
   },
   "libVersion": "2.33.0"
 }