用户协议，隐私政策分开显示

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/114

App.vue

@@ -10,7 +10,7 @@ export default {
         // #endif
 
 		getApp().globalData.im = this.imService
-		console.log('App Launch');
+		// console.log('App Launch');
         // 缓存token
         uni.getStorage({
         	key: "token",
@@ -22,10 +22,10 @@ export default {
         })
 	},
 	onShow: function() {
-		console.log('App Show');
+		// console.log('App Show');
 	},
 	onHide: function() {
-		console.log('App Hide');
+		// console.log('App Hide');
 	}
 };
 </script>

manifest.json

@@ -61,7 +61,13 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "应用将在您上传图文视频等服务中使用您的相册。",
+                    "NSMicrophoneUsageDescription" : "应用将会在您开启直播时使用您的麦克风。",
+                    "NSCameraUsageDescription" : "应用将会在您开启直播时使用您的摄像头。"
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
@@ -71,13 +77,13 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
+                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
                         "app" : "unpackage/res/icons/76x76.png",
                         "app@2x" : "unpackage/res/icons/152x152.png",
@@ -90,27 +96,27 @@
                         "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
+                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG"
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },
             "splashscreen" : {
                 "iosStyle" : "storyboard",
                 "ios" : {
-                    "storyboard" : "E:/Source-code/deming/static/CustomStoryboard.zip"
+                    "storyboard" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/CustomStoryboard.zip"
                 },
                 "androidStyle" : "default",
                 "android" : {
-                    "hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
+                    "hdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/480x762.png",
-                    "xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
+                    "xhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/720x1242.png",
-                    "xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
+                    "xxhdpi" : "/Users/xf/workspace/wwwroot/deming-uniapp/static/app/start/1080x1882.png"
                 }
             }
         }

pages.json

@@ -13,6 +13,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/login/agreements",
+			"style": {
+				"navigationBarTitleText": "用户协议与隐私政策",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/release/tosign",
 			"style": {
@@ -222,6 +234,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/feedback",
+			"style": {
+				"navigationBarTitleText": "用户反馈",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/user/complaintDetails",
 			"style": {

pages/index/otherdetails.vue

@@ -165,7 +165,7 @@ export default {
 			} else {
 				this.$u.api.agreetest({
 					goods_try_id: this.orderid,
-					type: 1,
+					type: 2,
 					takeawayer_id: this.selctcar.takeawayer_id
 				}).then(res => {
 					console.log(res);

pages/login/login.vue

@@ -51,6 +51,15 @@
                     </view>
                 </view>
 			</view>
+			<!-- 服务协议 -->
+			<view class="pact">
+				<view class="pact-container">
+					<u-checkbox v-model="consentPact" shape="circle" size="30" label-size="26" icon-size="12" active-color="#ff780f">
+						<text>我已详细阅读并同意</text>
+					</u-checkbox>
+					<text class="pact-items" v-for="item in pactList" :key="item.id" @click="viewAgreement(item.id)"> {{ item.text }}</text>
+				</view>
+			</view>
 			<!-- denglu QQ weixin -->
 			<button @click="logins">{{ login }}</button>
 			<!-- <u-button :custom-style="customStyle" ></u-button> -->
@@ -76,14 +85,22 @@ export default {
 			zhanghaoA: '',
 			mimaA: '',
 			url: '',
-            phone: "",
+			phone: "",
-            code: "",
+			code: "",
 			state:0,
 			clickstate:false,
-            // 时间
+			// 时间
-            timer: null,
+			timer: null,
-            is_sendcode: false, // 60s
+			is_sendcode: false, // 60s
-            time_count: 60,
+			time_count: 60,
+			consentPact: true,
+			pactList: [{
+				id: 1,
+				text: "《用户协议》"
+			},{
+				id: 2,
+				text: "《隐私政策》"
+			}]
 		};
 	},
 	methods: {
@@ -91,14 +108,6 @@ export default {
 		changetab(num){
 			this.state = num
 		},
-		// 选中某个复选框时，由checkbox时触发
-		checkboxChange(e) {
-			//console.log(e);
-		},
-		// 选中任一checkbox时，由checkbox-group触发
-		checkboxGroupChange(e) {
-			// console.log(e);
-		},
 		mask_u() {
 			this.show = !this.show;
 		},
@@ -138,17 +147,34 @@ export default {
             // console.log(this.$u.trim(this.zhanghaoA));
         },
 		logins() {
+			// 检查网络
+			uni.getNetworkType({
+			    success:  (res) => {
+			        console.log(res.networkType);
+					if (res.networkType == 'none') {
+						this.$refs.uToast.show({
+							title: '网络似乎断开了，请检查网络后重试',
+							type: 'error'
+						});
+					} 
+			    },
+			});
+			
+			// 不同意协议不让登录
+			if(!this.consentPact)  return false;
+
 			// 判断是否可以点击
             // console.log(this.zhanghao);
-			if(this.clickstate==false){
+			// if(this.clickstate==false){
-				this.clickstate=true
+			// 	this.clickstate=true
-			}else{
+			// }else{
-				this.$refs.uToast.show({
+				// 此验证存在逻辑问题,会出现卡死在这里的情况
-					title: "不能重复提交",
+				// this.$refs.uToast.show({
-					type: 'error'
+				// 	title: "不能重复提交",
-				});
+				// 	type: 'error'
-				return
+				// });
-			}
+				// return
+			// }
 			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
 			// uni.clearStorage();
 			// 账号登录1达人0商家
@@ -157,7 +183,7 @@ export default {
 					console.log(JSON.stringify(res))
 					if (res.errCode != 0) {
 						// 恢复按钮可点击状态
-						this.clickstate=false
+						// this.clickstate=false
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
@@ -208,7 +234,7 @@ export default {
 					console.log(JSON.stringify(res))
 					if (res.errCode != 0) {
 						// 恢复按钮可点击状态
-						this.clickstate=false
+						// this.clickstate=false
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
@@ -247,7 +273,15 @@ export default {
         },
         moveHandle(){
             return;
-        }
+				},
+				viewAgreement(id) {
+					this.$u.route({
+						url: '/pages/login/agreements',
+						params: {
+							id: id
+						}
+					});
+				}
 	},
 	onLoad() {
 		let token = uni.getStorageSync('token');
@@ -259,7 +293,7 @@ export default {
 				type: user.role == 2 ? 'tab' : 'to'
 			});
 		}
-	}
+	},
 };
 </script>
 
@@ -326,7 +360,7 @@ export default {
 .title {
 	font-size: 36rpx;
 	font-weight: bold;
-	margin-bottom: 150rpx;
+	margin-bottom: 120rpx;
 	color: #fff;
 	display: flex;
 	justify-content: flex-start;
@@ -370,9 +404,14 @@ export default {
         display: flex;
         align-items: center;
 		height: 90rpx;
-		margin-bottom: 160rpx;
 		line-height: 90rpx;
 		border-bottom: 1px #fff solid;
+		&:first-child {
+			margin-bottom: 100rpx;
+		}
+		&:nth-child(2) {
+			margin-bottom: 80rpx;
+		}
 		input {
 			width: 80%;
 			margin-left: 30rpx;
@@ -409,27 +448,27 @@ export default {
 	letter-spacing: 2rpx;
 }
 
-.pact text {
-	font-size: 22rpx;
-	font-weight: 400;
-	color: rgba(255, 255, 255, 1);
-	line-height: 36px;
-}
-
-.pact_text {
-	font-size: 22px;
-	font-weight: 400;
-	color: rgba(129, 188, 253, 1) !important;
-	line-height: 36px;
-}
-
-//单选框的样式
 .pact {
-	position: relative;
+	width: 670rpx;
-	padding-left: 40rpx;
+	margin: 0 auto 40rpx;
+	font-size: 26rpx;
 	overflow: hidden; //超出的文本隐藏
 	text-overflow: ellipsis; //溢出用省略号显示
 	white-space: nowrap; //溢出不换行
+	.pact-container {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		flex-wrap: wrap;
+		/deep/ .u-checkbox {
+			.u-checkbox__label {
+				margin-right: 0;
+			}
+		}
+		.pact-items {
+			color: rgba(255, 120, 15, 1);
+		}
+	}
 }
 
 .u-checkbox-group {

pages/release/video.vue

@@ -91,11 +91,18 @@ let COS = require('../../common/cos-wx-sdk-v5.js');
 const upload_file_server = (_this, filepath) => {
 	// 腾讯云配置
 	let cosConfig = {
-		Bucket: 'dmmall-1300406074', //replace with yours
+		Bucket: 'dmmall-1302895943', //replace with yours
 		Region: 'ap-shanghai', //replace with yours
-		SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
+		SecretId: 'AKID7z1lFeo0tV9YmmvZ52mrxlNmvqHTcuCF', //replace with yours
-		SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
+		SecretKey: 'd3zTJ0RFwMYVE7jAMJzQ4UbS4YmmJiPq' //replace with yours
 	};
+	// 腾讯云配置
+	// let cosConfig = {
+	// 	Bucket: 'dmmall-1300406074', //replace with yours
+	// 	Region: 'ap-shanghai', //replace with yours
+	// 	SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
+	// 	SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
+	// };
 	// 获取本地文件
 	let filePath = filepath;
 	// 自定义文件名以及路径
@@ -125,7 +132,7 @@ const upload_file_server = (_this, filepath) => {
 			console.log(err, data, 12345);
 			if (err == null) {
 				if (data.statusCode == 200) {
-					_this.videopath = 'https://dmmall-1300406074.cos.ap-shanghai.myqcloud.com/' + Key;
+					_this.videopath = 'https://dmmall-1302895943.cos.ap-shanghai.myqcloud.com/' + Key;
 					uni.hideLoading();
 					_this.videostate = true;
 				} else {

pages/release/zhibo.nvue

@@ -139,8 +139,8 @@
     font-size: 30rpx;
     color:#fff;
     width: 350rpx;
-    position: absolute;
+    position: absolute;	
-    top: 70rpx;
+	top: 70rpx;
     left: 31rpx;
     height: 31rpx;
 }
@@ -234,7 +234,9 @@
      border-bottom-width: 2rpx;
     border-style: solid;
     border-color: #ECECEC;
+	/* #ifndef APP-PLUS-NVUE */
     display: flex;
+	/* #endif */
     flex-direction: row;
     align-items: center;
 }
@@ -269,7 +271,9 @@
     border-bottom-width: 2rpx;
     border-style: solid;
     border-color: #ECECEC;
+	/* #ifndef APP-PLUS-NVUE */
     display: flex;
+	/* #endif */
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
@@ -347,7 +351,9 @@
     font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
+	/* #ifndef APP-PLUS-NVUE */
     word-wrap:anywhere;
+	/* #endif */
     font-weight: bold;
 }
 .livePusher{

pages/user/contentDetails.vue

@@ -36,7 +36,7 @@
 						<view class="name">{{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}}</view>
 						<view class="time">{{item.create_time}}</view>
 					</view>
-					<view class="btn" @click="showreply(item.id,item.member_id)">回复</view>
+					<view class="btn" @click="showreply(item.id,item.member_id)" v-if="item.pid==0">回复</view>
 				</view>
 				<view class="content u-line-1">{{item.content}}</view>
 			</view>

pages/user/feedback.vue

@@ -0,0 +1,117 @@
+<template>
+	<view class="write-complaints">
+		<view class="main-container">
+      <view class="text-box">
+        <u-input class="textarea" placeholder="发表您的意见吧，我们会做得更好。 (必填)" v-model="text" type="textarea" :clearable="false" :maxlength="200" />
+        <span class="text-length">{{ text.length }}/200</span>
+      </view>
+      <u-input class="phone" placeholder="请输入手机号方便联系 (非必填)" v-model="phone" type="number" />
+		</view>
+		<view class="write-btn" @click="submit">发表意见</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+export default {
+	data() {
+		return {
+      phone: '',
+			text: '',
+		}
+	},
+	methods: {
+		submit() {
+      if(!this.verifyContent()) return false;
+      // console.log(this.phone);
+			// console.log(this.text);
+			this.$u.toast('提交成功');
+			this.phone = "";
+			this.text = "";
+		},
+		verifyContent() {
+			if(this.$u.test.isEmpty(this.text)) {
+				this.$u.toast('内容不可为空');
+				return false;
+			}
+      if(!this.$u.test.isEmpty(this.phone)) {
+				if(!this.$u.test.mobile(this.phone)) {
+          this.$u.toast('手机格式错误');
+          return false;
+        }
+      }
+			return true;
+		},
+		writeFeedback() {
+			if(!this.verifyContent()) return false;
+			this.$u.api.writeFeedback({ 
+				fb_content: this.text,
+				fb_images: this.imageList,
+			}).then(res => {
+				if(res.errCode == 0) {
+					this.$refs.uToast.show({
+						title: res.message,
+						duration: 2000,
+						callback:() => {
+							this.$u.route({
+								type: "navigateBack",
+								url: '/pageE/more/Complaints',
+							})
+						}
+					})
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+	},
+}
+</script>
+<style lang="scss" scoped>
+.write-complaints {
+	min-height: calc(100vh - var(--window-top));
+	background-color: #ECECEC;
+	.main-container {
+		background-color: #ffffff;
+    .text-box {
+      padding-bottom: 60rpx;
+      position: relative;
+      &::after {
+        content: "";
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        height: 3rpx;
+        width: 750rpx;
+        background-color: #ECECEC;
+      }
+      .text-length {
+        height: 60rpx;
+        position: absolute;
+        right: 40rpx;
+        bottom: 0;
+        color: #999;
+      }
+    }
+		/deep/ .textarea {
+		  padding: 0 30rpx !important;
+			width: 100% !important;
+			margin-bottom: 10rpx;
+		}
+    /deep/ .phone {
+		  padding: 20rpx 30rpx !important;
+
+    }
+	}
+	.write-btn {
+		margin: 120rpx auto 0;
+		width: 690rpx;
+		height: 98rpx;
+		background: rgba(255,120,15,1);
+		border-radius: 46rpx;
+		font-size: 36rpx;
+		color: rgba(255,255,255,1);
+		text-align: center;
+		line-height: 98rpx;
+	}
+}
+</style>

pages/user/index.vue

@@ -23,6 +23,18 @@
 			<text>骑手投诉</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+        <view class="nav" @click="toOthersPage('feedback')">
+			<text>用户反馈</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+        <view class="nav" @click="viewAgreement(1)">
+			<text>用户协议</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
+        <view class="nav" @click="viewAgreement(2)">
+			<text>隐私政策</text>
+			<image src="/static/image/user/1.png"></image>
+		</view>
 		<view class="nav" @click="clearCache">
 			<text>清除缓存</text>
             <text>{{ fileSizeString }}</text>
@@ -138,7 +150,15 @@ export default {
 			uni.navigateTo({
 				url: '/pages/user/' + url
 			});
-		}
+        },
+        viewAgreement(id) {
+            this.$u.route({
+                url: '/pages/login/agreements',
+                params: {
+                    id: id
+                }
+            });
+        }
 	},
 }
 </script>

pages/user/info.vue

@@ -5,7 +5,8 @@
 			<text>更换头像</text>
 		</view>
 		<view class="item">
-			<text class="title">店铺名称</text>
+			<text class="title" v-if="role == 2">店铺名称</text>
+			<text class="title" v-else>达人名称</text>
 			<input type="text" value="" v-model="info.member_nickname" placeholder="请输入用户名"/>
 		</view>
 		<view class="item">
@@ -114,7 +115,7 @@ export default {
 						},
 						success: uploadFileRes => {
 							let obj = JSON.parse(uploadFileRes.data)
-							that.fileurl = obj.data.file_path
+							that.fileurl = obj.data.file_path+'?'+new Date().getTime()
 							that.filename =  obj.data.file_name
 							that.num++
 							console.log(that.fileurl,that.filename)

pages/user/myinfo.vue

@@ -2,7 +2,7 @@
     <view class="user">
         <view class="head" @click="toOthersPage('info')">
             <view class="info">
-                <image :src="info.member_avatar"></image>
+                <image :src="info.member_avatar + '?' + (new Date().getTime())"></image>
                 <view class="name">
                     <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                     <text>账号：{{info.member_name}}</text>

static/chatservice.js

@@ -62,7 +62,7 @@ function ChatRoomService(room, user) {
 //获取实例
 ChatRoomService.prototype.connectGoEasyIM = function () {
     this.im = GoEasyIM.getInstance({
-        appkey: 'BC-453aa755c4ea48148abefc55a86df283',
+        appkey: 'BC-d9b5e639006b4ee2a4bc9eddc4235a6a',
         host: 'hangzhou.goeasy.io'
     });
 

static/imservice.js

@@ -36,7 +36,7 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
     this.im = GoEasyIM.getInstance({
         host:'hangzhou.goeasy.io',//qos=1
-        appkey:'BC-453aa755c4ea48148abefc55a86df283'
+        appkey:'BC-d9b5e639006b4ee2a4bc9eddc4235a6a'
     });
     //当前“我”
     this.currentUser = null;