@dongkboy 1 год назад
Родитель
Сommit
f537d12b7c

+ 2 - 2
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.8.9",
-	"versionCode": 289,
+	"versionName": "2.9.1",
+	"versionCode": 291,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

+ 0 - 1
pages.json

@@ -401,7 +401,6 @@
 			"path": "pages/tools/team/team",
 			"style": {
 				"navigationBarTitleText": "会员管理",
-				"enablePullDownRefresh": true, //开启下拉刷新
 				"app-plus": {
 					"titleNView": false,
 					"scrollIndicator": "none",

+ 3 - 0
pages/login/login.vue

@@ -95,6 +95,8 @@
 					我已确认并同意<view> <text @tap="nav('/pages/login/xieyi')" class="text-color">平台协议</text>及<text
 							class="text-color" @tap="nav('/pages/login/mimi')">隐私协议</text>政策</view>
 				</view>
+
+				<!-- #ifdef APP -->
 				<view class="third_party_login_box">
 					<view class="third_party_title"><text>第三方登录</text></view>
 					<view class="third_party_content flex-wrap">
@@ -102,6 +104,7 @@
 						<image src="../../static/image/login/zf.png" @click="onzfbAppLogin" mode="aspectFit"></image>
 					</view>
 				</view>
+				<!-- #endif -->
 			</view>
 		</view>
 		<u-toast ref="uToast" />

+ 5 - 10
pages/orders/orders.vue

@@ -285,13 +285,6 @@
 	} from "vue";
 	export default {
 		components: {},
-		watch: {
-			stageIndex(newVal, oldVal) {
-				if (newVal !== oldVal) {
-					this.pageRequest.orderStatus = newVal;
-				}
-			}
-		},
 		data() {
 			return {
 				closeOrderShow: false,
@@ -465,6 +458,7 @@
 						"date": "2024-08-01 08:49:12"
 					}
 				],
+				orderno: "",
 			}
 		},
 		onReachBottom() {
@@ -481,7 +475,7 @@
 			}, 1000)
 		},
 		computed: {
-			...mapState(['userInfo', 'typeIndex', 'stageIndex'])
+			...mapState(['userInfo', 'typeIndex'])
 		},
 
 		// 页面滚动触发
@@ -521,17 +515,18 @@
 				});
 			},
 			async closeOrderconfirm() {
-				let res = await this.$http.get('/insurance/order/shutDown/' + orderno);
+				let res = await this.$http.get('/insurance/order/shutDown/' + this.orderno);
 				if (res.code == '200') {
+					this.getOrdersList(1, 20);
 					uni.showToast({
 						title: "关闭成功",
 						icon: 'none',
 					});
-					this.getOrdersList(1, 20);
 				}
 			},
 			//关闭订单
 			closeOrder(orderno) {
+				this.orderno = orderno;
 				this.closeOrderShow = true;
 			},
 			btn_click() {

+ 2 - 1
pages/tools/addStaff/authentication1.vue

@@ -136,7 +136,8 @@
 				this.querylist();
 			},
 			//搜索按钮事件
-			custom(val) {
+			clear(val) {
+				this.pageRequest.criteria = "";
 				this.querylist();
 			},
 		}

+ 2 - 1
pages/tools/addStaff/authentication2.vue

@@ -136,7 +136,8 @@
 				this.querylist();
 			},
 			//搜索按钮事件
-			custom(val) {
+			clear(val) {
+				this.pageRequest.criteria = "";
 				this.querylist();
 			},
 		}

+ 4 - 3
pages/tools/addStaff/authentication3.vue

@@ -9,8 +9,8 @@
 			</view>
 			<view class="search dis j-s a-c mt-5">
 				<u-search v-model="pageRequest.criteria"
-					style="box-shadow: 0px 4px 10px 0px #DAE3F4;border-radius: 6px;" @custom="custom" @search="search"
-					:shape="shape" :height='68' bg-color="#fff" color="#000" :input-style="{background:'transparent'}"
+					style="box-shadow: 0px 4px 10px 0px #DAE3F4;border-radius: 6px;" @search="search" :shape="shape"
+					:height='68' bg-color="#fff" color="#000" :input-style="{background:'transparent'}"
 					placeholder-color="rgba(51,51,51,0.6)" :clearabled="clearabled" :show-action="showAction"
 					:input-align="inputAlign" @clear="clear" :action-style="{background:'#fff'}"
 					placeholder="请输入工号、姓名、手机号查询"></u-search>
@@ -184,7 +184,8 @@
 				this.querylist();
 			},
 			//搜索按钮事件
-			custom(val) {
+			clear(val) {
+				this.pageRequest.criteria = "";
 				this.querylist();
 			},
 		}

+ 2 - 2
pages/tools/team/team.vue

@@ -24,7 +24,7 @@
 						<text @click="endshow=true">{{enddate}}</text>
 					</view>
 					<view class="d-flex a-center j-center" @click="queryData()">
-						<image src="../../../static/icon/search.png" mode="" style="width: 20px;height: 20px;"></image>
+						<text>刷新</text>
 					</view>
 				</view>
 				<view class="teamStatistics">
@@ -357,7 +357,7 @@
 					success: (res) => {
 						res.eventChannel.emit("acceptData", {
 							item: this[name][index],
-							date: this.dateRange
+							date: [this.startdate, this.enddate]
 						})
 					}
 				}, "navigateTo", true)