更新

smart-system/src/main/resources/mapper/management/MemberHelpMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMemberHelpVo">
-        select member_help_id, member_id, phone, create_time, lat, lng,
+        select member_help_id, member_id, phone,member_phone,create_time, lat, lng,
          (select name from t_member where t_member.member_id = t_member_help.member_id) member_name,
          (select nick_name from t_member where t_member.member_id = t_member_help.member_id) nick_name
          from t_member_help

smart-ui-app/common/http.js

@@ -1,4 +1,4 @@
-//const ip = 'http://192.168.0.109:8080';
+//const ip = 'http://192.168.2.101:8080';
 //const ip = 'https://qfnj.gaswkj.com/prod-api';
 //const ip = 'http://192.168.2.102:8080';
 const ip = 'https://xdmly.qiyiiot.com/prod-api';
@@ -57,14 +57,30 @@ const request = (opt) => {
 			}, 500)
 			if (res.data.code == 200) {
 				opt.success(res);
-			} else {
+				return;
+			}
+			if (res.data.code == 500) {
 				uni.showModal({
 					content: res.data.msg,
 					showCancel: false
 				});
 				return;
 			}
-
+			if (res.data.code == 401) {
+				uni.removeStorageSync('user');
+				uni.showModal({
+					title: '提示',
+					content: '您还未登陆,请先登陆!',
+					success: res => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/user/login'
+							})
+						}
+					}
+				});
+				return;
+			}
 		},
 		fail: e => {
 			uni.hideLoading();

smart-ui-app/pages.json

@@ -4,18 +4,18 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/user/my",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "我的",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
+				
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/user/my",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "我的",
 				"navigationStyle": "custom"
-				
 			}
 		},
 		{

smart-ui-app/pages/index/index.vue

@@ -117,7 +117,13 @@ export default {
 										this.$http.request({
 											method: 'POST',
 											url: this.$http.urls.pushHelp,
-											data: { memberId: this.$getUser().memberId, lat: res.latitude, lng: res.longitude, phone: this.$getUser().mobile },
+											data: {
+												memberId: this.$getUser().memberId,
+												lat: res.latitude,
+												lng: res.longitude,
+												phone: this.item.helpPhone,
+												memberPhone: this.$getUser().mobile
+											},
 											success: r => {
 												uni.makePhoneCall({
 													phoneNumber: this.item.helpPhone

smart-ui-app/pages/user/login.vue

@@ -6,8 +6,8 @@
 			<text v-if="first">您的公开信息（昵称，头像，性别等）</text>
 			<text v-else>您的手机号</text>
 		</view>
-		<button class="btn" @click="getUserProfile()" v-if="!bindPhone">允许使用</button>
-		<button class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="background-color: #2196F3" v-else>允许使用</button>
+		<button class="btn" @click="getUserProfile()" v-if="first">允许使用</button>
+		<button class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" style="background-color: #2196F3" v-else>绑定手机号</button>
 		<button class="btn" style="background-color: #9E9E9E;" @click="cancel()">取消</button>
 	</view>
 </template>
@@ -15,22 +15,15 @@
 export default {
 	data() {
 		return {
-			bindPhone: false,//是否绑定手机号
-			click: true, //防止多次点击
-			item: {}
+			first: true //是否第一次使用，第一次使用需要绑定手机号
 		};
 	},
 	methods: {
 		getUserProfile() {
-			if (!this.click) {
-				return;
-			}
-			this.click = false;
 			let code = '';
 			uni.login({
 				provider: 'weixin',
 				success: res => {
-					console.log('微信登陆成功:' + JSON.stringify(res));
 					code = res.code;
 				}
 			});
@@ -40,20 +33,17 @@ export default {
 				lang: 'zh_CN',
 				provider: 'weixin',
 				success: info => {
-					console.log('获取微信资料：' + JSON.stringify(info));
 					this.$http.request({
 						url: this.$http.urls.wxLogin + code,
 						data: info,
 						method: 'POST',
 						success: res => {
 							res.data.data.memberInfo.apiToken = res.data.data.apiToken;
+							uni.setStorageSync('user', res.data.data.memberInfo);
 							//未绑定手机号
 							if (res.data.data.memberInfo.mobile == null || res.data.data.memberInfo.mobile == '') {
-								this.click = true;
-								this.bindPhone = false;
-								this.item = res.data.data.memberInfo;
+								this.first = false;
 							} else {
-								uni.setStorageSync('user', res.data.data.memberInfo);
 								uni.navigateBack({ delta: 1 });
 							}
 						}
@@ -66,10 +56,6 @@ export default {
 		},
 		// 绑定用户手机号
 		getPhoneNumber(e) {
-			if (!this.click) {
-				return;
-			}
-			this.click = false;
 			let item = {};
 			uni.login({
 				provider: 'weixin',
@@ -82,13 +68,9 @@ export default {
 						data: item,
 						method: 'POST',
 						success: r => {
-							uni.setStorageSync('user', this.item);
 							uni.navigateBack({ delta: 1 });
 						}
 					});
-				},
-				fail: res => {
-					this.click = true;
 				}
 			});
 		},

smart-ui/src/views/management/help/index.vue

@@ -20,6 +20,7 @@
       <el-table-column label="会员名称" align="center" prop="memberName" />
       <el-table-column label="会员昵称" align="center" prop="nickName" />
       <el-table-column label="求助电话" align="center" prop="phone" />
+      <el-table-column label="会员电话" align="center" prop="memberPhone" />
       <el-table-column label="求助时间" align="center" prop="createTime" width="180"></el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

smart-ui/src/views/management/member/index.vue

@@ -31,7 +31,6 @@
       <el-table-column label="上次登录时间" align="center" prop="lastLoginTime" width="120" />
       <el-table-column label="上次登录IP" align="center" prop="lastLoginIp" />
       <el-table-column label="登录次数" align="center" prop="loginNum" />
-      <!-- <el-table-column label="微信openid" align="center" prop="openid" /> -->
       <el-table-column label="昵称" align="center" prop="nickName" />
       <el-table-column label="会员头像" align="center" prop="avatarUrl">
         <template slot-scope="scope">
@@ -126,7 +125,9 @@ export default {
         name: null,
         mobile: null,
         nickName: null,
-        gender: null
+        gender: null,
+        orderByColumn: 'registerTime', //排序字段
+        isAsc: 'desc' //排序方式sss
       },
       // 表单参数
       form: {},

smart-ui/src/views/management/shop/index.vue

@@ -37,6 +37,7 @@
       <el-table-column label="地址" align="center" prop="addres" />
       <el-table-column label="状态" align="center" prop="enableFlag" :formatter="enableFlagFormat" />
       <el-table-column label="审核状态" align="center" prop="auditFlag" :formatter="auditFlagFormat" />
+      <el-table-column label="申请时间" align="center" prop="createTime" width="180" />
       <!-- <el-table-column label="审核人" align="center" prop="auditAt" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -168,7 +169,9 @@ export default {
         bossName: null,
         bossPhone: null,
         enableFlag: null,
-        auditFlag: null
+        auditFlag: null,
+        orderByColumn: 'createTime', //排序字段
+        isAsc: 'desc' //排序方式
       },
       // 表单参数
       form: {},