Merge pull request '修改协议隐私' (#399) from qxf into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/399

components/logininput/logininput.vue

@@ -17,7 +17,7 @@
 				<text>我已详细阅读并同意</text>
 				<text class="pact_text">《用户协议》</text>
 				<text class="pact_text">《隐私协议》</text>
-				<text class="pact_text">《使用协议》</text>
+				<!-- <text class="pact_text">《使用协议》</text> -->
 				<u-checkbox-group @change="checkboxGroupChange" size="27">
 					<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.name"
 					 shape="circle" size="14" active-color="#19BE6B"></u-checkbox>

components/mine/order-item/index.vue

@@ -130,7 +130,7 @@ export default {
 					state = '待退款';
 					break;
 				case 7:
-					state = '已退款';
+					state = '商家已退款';
 					break;
 				case 9:
 					state = '拼团中';
@@ -139,7 +139,10 @@ export default {
 					state = '已取消';
 					break;
 				case 11:
-					state = '已拒绝';
+					state = '商家已拒绝';
+					break;
+				case 12:
+					state = '平台已退款';
 					break;	
 				default:
 					break;

components/remaining/remaining.vue

@@ -33,12 +33,16 @@
 		<!-- 用户协议弹窗 -->
 		<view class="welcome_backes" v-if="protocol">
 			<view class="content">
-				<view class="title">{{ agreement.document_title }}</view>
+				<!-- <view class="title">{{ agreement.document_title }}</view> -->
+				<view class="title">用户协议</view>
 				<!-- <text class="protocol_content"></text> -->
 				<scroll-view scroll-y class="scroll">
 					<rich-text class="protocol_content" :nodes="agreement.document_content"></rich-text>
 				</scroll-view>
-				<view class="to_agree" @click="to_agree">我同意</view>
+				<view class="agree-btn">
+					<view class="refuse" @click="refuseAgreement">不同意并退出</view>
+					<view class="to_agree" @click="to_agree">同意</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -74,7 +78,7 @@
 				duration: 500,
 				swiper_index: "",
 				tiaoguo:false,
-				weizhi:0
+				weizhi:0,
 			};
 		},
 		onReady: function(res) {
@@ -165,6 +169,21 @@
 					url: '/pageA/login/login'
 				});
 			},
+			// 拒绝协议
+			refuseAgreement() {
+				//退出app
+				// #ifdef APP-PLUS
+				if (plus.os.name.toLowerCase() === 'android') {
+					plus.runtime.quit();
+				} else{ 
+					const threadClass = plus.ios.importClass("NSThread");
+					const mainThread = plus.ios.invoke(threadClass, "mainThread");
+					plus.ios.invoke(mainThread, "exit");
+					// ios11
+					plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+				}
+				// #endif
+			},
 			// 视频引入
 			bindInputBlur: function(e) {
 				this.inputValue = e.target.value;
@@ -327,15 +346,37 @@
 				}
 			}
 
-			.to_agree {
-				width: 558rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: rgba(255, 121, 16, 1);
-				text-align: center;
-				padding-top: 27rpx;
-				border-top: #D8D8D8 solid 1px;
+			.agree-btn {
+				border-top: #D8D8D8 solid 1rpx;
+				// padding-top: 27rpx;
+				display: flex;
+				height: 80rpx;
+				> view {
+					height: inherit;
+					flex: 1;
+					font-size: 30rpx;
+					font-weight: bold;
+					text-align: center;
+					line-height: 80rpx;
+				}
+				.refuse {
+					color: #999;
+					position: relative;
+					&:after {
+						content: "";
+						height: 80rpx;
+						width: 1rpx;
+						background-color: #D8D8D8;
+						position: absolute;
+						right: 0;
+						top: 0;
+					}
+				}
+				.to_agree {
+					color: rgba(255, 121, 16, 1);
+				}
 			}
+			
 		}
 	}
 </style>

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__EBFF00A",
     "description" : "",
     "versionName" : "1.0.1",
-    "versionCode" : "100",
+    "versionCode" : 107,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -67,7 +67,13 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "privacyDescription" : {
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
+                    "NSLocationWhenInUseUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。",
+                    "NSLocationAlwaysUsageDescription" : "德铭阳光将在推荐商品、收货地址等服务中使用您的位置信息。"
+                }
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
@@ -119,22 +125,22 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "E:/Source-code/appleidmore/安卓png/72x72psd.PNG",
-                    "xhdpi" : "E:/Source-code/appleidmore/安卓png/96x96psd.PNG",
-                    "xxhdpi" : "E:/Source-code/appleidmore/安卓png/144x144.PNG",
-                    "xxxhdpi" : "E:/Source-code/appleidmore/安卓png/192x192.PNG"
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "E:/Source-code/appleidmore/苹果png/appstore 1024X1024.PNG",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "iphone" : {
-                        "app@2x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
-                        "app@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
-                        "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
-                        "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG",
-                        "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
-                        "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
-                        "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
-                        "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG"
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png"
                     },
                     "ipad" : {
                         "app" : "unpackage/res/icons/76x76.png",

pageA/bindinges/bindinges.vue

@@ -41,7 +41,7 @@
                 timer: null,
 				is_sendcode: false, // 60s
                 time_count: 60,
-                pactList: [ "《用户协议》", "《隐私协议》", "《使用协议》" ],
+                pactList: [ "《用户协议》", "《隐私协议》" ],
 			};
 		},
 		methods: {

pageA/login/login.vue

@@ -34,7 +34,8 @@
 			<!-- 注册 -->
 			<view class="more_Login">
 				<text @click="registerUrl()">{{register}}</text>
-				<text class="other" @click="mask_u">其他方式登录</text>
+				<!-- TODO 苹果因审核原因暂时隐藏第三方登录 -->
+				<text v-if="platform != 'ios'" class="other" @click="mask_u">其他方式登录</text>
 			</view>
 			<!-- denglu QQ weixin -->
 			<view class="buttones">
@@ -92,17 +93,27 @@
 				}, {
 					"id": '2',
 					"text": "《隐私协议》"
-				}, {
-					"id": '3',
-					"text": "《使用协议》"
-				}, ],
+				},
+				// {
+				// 	"id": '3',
+				// 	"text": "《使用协议》"
+				// }, 
+				],
 				temp_url: "", // 上个页面路径
 				pagesArr: ["pages/mine/index"], // 特殊路径
+				platform: '', // 手机平台
 			};
 		},
 		onLoad() {
 			// 数据的请求
 			// this.apiwelcome();
+			// 获取手机平台
+			uni.getSystemInfo({
+			    success: (res) => {
+					console.log(res);
+					this.platform = res.platform
+			    }
+			});
 		},
 		onShow() {
 			let pages = getCurrentPages();

pageA/register/register.vue

@@ -82,10 +82,11 @@
 					}, {
 						"id": '2',
 						"text": "《隐私协议》"
-					}, {
-						"id": '3',
-						"text": "《使用协议》"
-					},
+					}, 
+					// {
+					// 	"id": '3',
+					// 	"text": "《使用协议》"
+					// },
 				
 				]
 			};

pageC/groupBuy/index.vue

@@ -6,12 +6,12 @@
 		</view>
 		<swiper :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
-				<scroll-view scroll-y style="width: 100%;" @scrolltolower="onreachBottom">
+				<scroll-view scroll-y style="width: 100%;height: 100%;" @scrolltolower="onreachBottom">
 					<view v-if="pinTuanList[index]">
 						<SpecialGoods v-for="(item, index) in pinTuanList[index]" :key="index" :item="item" type='group'></SpecialGoods>
 					</view>
 					<u-empty text="暂无商品" mode="list" color="#000" margin-top="120" v-if="!pinTuanList[index] || !pinTuanList[index].length"></u-empty>
-					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList[index] && pinTuanList[index].length>=pageSize" @loadmore="onreachBottom"></u-loadmore>
+					<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" v-if="pinTuanList[index]" @loadmore="onreachBottom"></u-loadmore>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
@@ -22,7 +22,6 @@ import SpecialGoods from "../../components/shop/special-shop/index";
 export default {
 	data() {
 		return {
-			pageSize: 6,
 			tabList: [],
 			current: -1,
 			swiperCurrent: 0,
@@ -42,6 +41,7 @@ export default {
 	},
 	watch: {
 		current(index) {
+			this.page = 0;
 			this.getPinTuanList({ id: this.tabList[index].gc_id, load: 'reload' });
 		}
 	},
@@ -56,7 +56,7 @@ export default {
 			})
 		},
 		// 拼团列表
-		async getPinTuanList({ id, page, load }) {
+		async getPinTuanList({ id, load }) {
 			const res = await this.$u.api.getPinTuanList({
 				page: this.page,
 				gc_id: id,

pageC/merchant/storeClassify.vue

@@ -12,7 +12,7 @@
 			<view v-for="classifyA in classifyList" :key="classifyA.gc_parent_id" class="classify-view">
 				<view class="title">{{ classifyA.gc_parent_name }}</view>
 				<view class="classifyA-view">
-					<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_parent_id, name: classifyB.gc_parent_name })">{{ classifyB.gc_parent_name }}</view>
+					<view v-for="classifyB in classifyA.gc_child" :key="classifyB.gc_id" class="classifyB-item u-line-1" @click="viewGoods({ type: classifyB.gc_id, name: classifyB.gc_name })">{{ classifyB.gc_name }}</view>
 				</view>
 			</view>
 		</view>

pageC/spike/index.vue

@@ -1,7 +1,7 @@
 <template>
-	<view class="spike">
+	<scroll-view class="spike" scroll-y @scrolltolower="onreachBottom">
 		<view class="title">
-            <view class="name">全部秒杀</view>
+      <view class="name">全部秒杀</view>
 			<view class="time">
 				<text class="num">{{ seckillTime.littleHour || '00' }}</text>
 				<text class="mah">:</text>
@@ -19,8 +19,9 @@
 		<view class="spike-list">
 			<SpecialGoods v-for="(item, index) in spikeList" :key="index" :item="item" type='spike'></SpecialGoods>
 			<u-empty mode="list" v-if="!spikeList.length" :margin-top="240"></u-empty>
+			<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20" @loadmore="onreachBottom"></u-loadmore>
 		</view>
-	</view>
+	</scroll-view>
 </template>
 <script>
 import SpecialGoods from "@/components/shop/special-shop/index"
@@ -29,27 +30,50 @@ export default {
 		return {
 			spikeList: [],
 			page: 0,
-			seckillTime: {}
+			seckillTime: {},
+			timer: true, // 限制下拉刷新
+			loadStatus: 'loadmore',
 		}
 	},
 	components: {
 		SpecialGoods
 	},
 	onShow() {
-		this.getSpikeList();
+		this.getSpikeList({ load: "reload" });
 	},
 	methods: {
 		// 全部秒杀
-		getSpikeList() {
-			this.$u.api.getSpikeList({ page: this.page }).then(res => {
-				console.log(res)
-				if(res.errCode == 0) {
-					this.spikeList = res.data.list;
-					this.seckillTime = {
-						bigHour: res.data.bigHour,
-						littleHour: res.data.littleHour,
-					}
+		async getSpikeList({ load }) {
+			const res = await this.$u.api.getSpikeList({
+				page: this.page,
+			})
+			this.timer = true;
+			if (res.errCode == 0) {
+				this.seckillTime = {
+					bigHour: res.data.bigHour,
+					littleHour: res.data.littleHour,
 				}
+				if(load == 'reload') this.spikeList = res.data.list;
+				else if(load == 'loadmore') this.spikeList.push(...res.data.list);
+			}
+			this.$forceUpdate();
+			return res.data.list.length;
+		},
+		onreachBottom() {
+			if(!this.timer) return false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getSpikeList({ load: "loadmore" }).then(length => {
+				// console.log(length);
+				if(length == 0) {
+					this.page--;
+					this.loadStatus = 'nomore';
+				} else {
+					this.loadStatus = 'loadmore';
+				}
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
 			})
 		},
 	}
@@ -57,9 +81,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .spike{
-	min-height: calc(100vh - var(--window-top));
+	height: calc(100vh - var(--window-top));
 	padding: 30rpx;
 	border-top: 1rpx solid rgba(236,236,236,1);
+	box-sizing: border-box;
 	.title{
 		margin-bottom: 30rpx;
 		display: flex;

pageD/attention/attention.vue

@@ -5,7 +5,7 @@
 				<image :src="item.friend_tomavatar" mode="aspectFill"></image>
 				<view class="tishi" v-if="item.unread_message"></view>
 			</view>
-			<view>{{item.friend_tomname}}</view>
+			<view>{{item.friend_tomnickname}}</view>
 			<view>{{item.live_status ? '正在直播' : '未直播'}}</view>
 			<view  class="cur_two"  @click="tapClick(index)">已关注</view>
 			<!-- <view class="cur"   @click="tapClick(index)" v-else = "item.about == 2">未关注</view> -->

pageE/mine/MineInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="information">
 		<view class="info-avatar">
-			<u-avatar :src="userInfo.member_avatar" :size="120"></u-avatar>
+			<u-avatar :src="userInfo.member_avatar + '?' + (new Date().getTime())" :size="120"></u-avatar>
 		</view>
 		<view class="info-item">
 			<view class="title">昵称</view>
@@ -51,8 +51,8 @@ export default {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
 				if (res.errCode == 0) {
-					// this.userInfo = res.data.MemberArray;
-					this.$set(this, 'userInfo', res.data.MemberArray);
+					this.userInfo = res.data.MemberArray;
+					// this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},

pageE/order/Details.vue

@@ -115,7 +115,7 @@ export default {
 					image: '../static/mine/36.png',
 				},
 				'5': {
-					text: '已退款',
+					text: '商家已退款',
 					image: '../static/mine/34.png',
 				},
 				'6': {
@@ -135,7 +135,11 @@ export default {
 					image: '../static/mine/33.png',
 				},
 				'10': {
-					text: '已拒绝',
+					text: '商家已拒绝',
+					image: '../static/mine/34.png',
+				},
+				'11': {
+					text: '平台已退款',
 					image: '../static/mine/34.png',
 				},
 			},
@@ -329,6 +333,9 @@ export default {
 				case 11:
 					state = '10';
 					break;
+				case 12:
+					state = '11';
+					break;
 				default:
 					break;
 			}

pageE/order/RefundOrder.vue

@@ -137,7 +137,6 @@ export default {
 			return true;
 		},
 		applyRefund() {
-			
 			if(this.type !=2 && !this.verifyParams()) return false;
 			// addrefundall 只需要订单id 和 说明
 			let params = {
@@ -154,6 +153,7 @@ export default {
 					if(res.errCode == 0) {
 						this.$refs.uToast.show({
 							title: res.message,
+							type: 'success',
 							back: true,
 						})
 					} else {

pageE/setting/Index.vue

@@ -78,6 +78,14 @@
 						title: '帮助与反馈',
 						link: './feedback'
 					},
+					{
+						title: '用户协议',
+						link: '/pageA/pactList/pactList?index=0'
+					},
+					{
+						title: '隐私政策',
+						link: '/pageA/pactList/pactList?index=1'
+					},
 				],
 				content: "是否退出登录！",
 				show: false,
@@ -129,8 +137,8 @@
                             plus.cache.clear(function(e) {
                                 console.log(e);
                             })
+                            this.getCache();
                         }
-                        this.getCache();
                     }
                 })
                 // #endif

pageE/tool/SendWash.vue

@@ -21,7 +21,7 @@
 							<view class="order-status">{{ item.order_status | viewStatus }}</view>
 						</view>
 						<view class="order-info">
-							<image :src="type == 1 ? item.goods_image : item.images[0]" mode="aspectFit"></image>
+							<image :src="type == 1 ? item.goods_image : (Array.isArray(item.images) ? item.images[0] : '/static/image/mine/47.png')" mode="aspectFit"></image>
 							<view v-if="item.deliver_goods_type == 2 && item.order_status == 20">
 								<view>骑手名字：{{ item.takeawayer_name || '' }}</view>
 								<view>联系方式：{{ item.takeawayer_mobile || '' }}</view>

pages/information/information.vue

@@ -127,7 +127,8 @@
 					uni.request({
 						url:"https://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
 						data:{
-							userId: 1
+							userId: 1,
+							markup: 1
 						},
 						method:"POST",
 						header:{

pages/mine/index.vue

@@ -2,7 +2,7 @@
     <view class="mine">
         <view class="mine-top">
             <view class="top">
-				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar" :size="110"></u-avatar>
+				<u-avatar  @click="toOtherPage('/mine/MineInfo')" :src="userInfo.member_avatar + '?' + (new Date().getTime())" :size="110"></u-avatar>
 				<view class="user-info">
 					<view class="info-top">
 						<view class="user-nickname u-line-1">{{ userInfo.member_nickname }}</view>
@@ -207,8 +207,8 @@ export default {
 			this.$u.api.getMemberInfo().then(res => {
 				// uni.stopPullDownRefresh();
 				if (res.errCode == 0) {
-					// this.userInfo = res.data.MemberArray;
-					this.$set(this, 'userInfo', res.data.MemberArray);
+					this.userInfo = res.data.MemberArray;
+					// this.$set(this, 'userInfo', res.data.MemberArray);
 				}
 			})
 		},

pages/zhibo/index.nvue

@@ -96,7 +96,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;
@@ -124,7 +126,9 @@
      border-bottom-width: 2rpx;
     border-style: solid;
     border-color: #ECECEC;
+	/* #ifndef APP-PLUS-NVUE */
     display: flex;
+	/* #endif */
     flex-direction: row;
     align-items: center;
 }
@@ -183,7 +187,9 @@
     border-radius: 30rpx;
 }
 .userlist{
+	/* #ifndef APP-PLUS-NVUE */
     display: flex;
+	/* #endif */
     flex-direction: row-reverse;
     width: 150rpx; 
     height: 60rpx;
@@ -205,7 +211,9 @@
   text-overflow: ellipsis;
 }
 .userinfo {
+	/* #ifndef APP-PLUS-NVUE */
   display: flex;
+  /* #endif */
   flex-direction: column;
   width: 100rpx;
   margin-left: 20rpx;
@@ -240,7 +248,9 @@
   left: 30rpx;
   width: 308rpx;
   height: 70rpx;
+  /* #ifndef APP-PLUS-NVUE */
   display: flex;
+  /* #endif */
   align-items: center;
   border-radius: 35rpx;
   overflow: hidden;
@@ -315,7 +325,9 @@
     font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
+	/* #ifndef APP-PLUS-NVUE */
     word-wrap:anywhere;
+	/* #endif */
     font-weight: bold;
 }
 </style>

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'
     });