Update index.vue

Update manifest.json
用户协议和隐私政策
2020-12-07 17:13:37 +08:00 · 2020-12-07 17:13:34 +08:00 · 2020-12-03 21:50:39 +08:00 · 2020-12-01 18:03:14 +08:00 · 2020-12-01 18:01:46 +08:00 · 2020-12-01 17:55:49 +08:00
24 changed files with 713 additions and 156 deletions
--- a/App.vue
+++ b/App.vue
@@ -4,8 +4,13 @@ export default {
 		im: {}  
 	},  
 	onLaunch: function() {
+        // 禁止旋转
+        // #ifdef APP-PLUS
+        plus.screen.lockOrientation('portrait-primary');
+        // #endif
+
 		getApp().globalData.im = this.imService
-		console.log('App Launch');
+		// console.log('App Launch');
        // 缓存token
        uni.getStorage({
        	key: "token",
@@ -17,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>
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -157,7 +157,12 @@ const install = (Vue, vm) => {
        // 达人登录
        starLogin({member_mobile,sms_code}) {
            return vm.$u.post("/Login/platformExpertPhoneLogin",{member_mobile,sms_code})
-        }
+		},
+		//上传直播间人数
+		//https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber?live_id=1&realtime_number=10
+		changeLiveRealtimeNumber({id,number}){
+			return vm.$u.post("Streaming/changeLiveRealtimeNumber",{live_id:id,realtime_number:number})
+		}
 		
    }
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -14,12 +14,13 @@
 				<view class="status" v-else-if="info.view_type==5">已退款订单</view>
 				<view class="status" v-else-if="info.view_type==6">商家同意</view>
 				<view class="status" v-else-if="info.view_type==7">商家拒绝</view>
+				<view class="status" v-else-if="info.view_type==10">待支付订单</view>
 			</view>
 			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 			<view class="info">
 				<view class="num">共{{info.count_number}}件商品</view>
-				<view class="price">实付<span>￥{{info.order_amount}}</span></view>
-                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
+				<view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>￥{{info.order_amount}}</span></view>
+                <view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view>
 			</view>
 		</view>
 	</view>
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "德铭阳光商家",
    "appid" : "__UNI__EA895BE",
    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.1",
+    "versionCode" : 106,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
@@ -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",
-                    "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",
                    "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@3x" : "E:/Source-code/appleidmore/苹果png/180x180.PNG",
-                        "notification@2x" : "E:/Source-code/appleidmore/苹果png/40X40.PNG",
-                        "notification@3x" : "E:/Source-code/appleidmore/苹果png/60X60.PNG",
-                        "settings@2x" : "E:/Source-code/appleidmore/苹果png/58x58psd.PNG",
-                        "settings@3x" : "E:/Source-code/appleidmore/苹果png/87X87.PNG",
-                        "spotlight@2x" : "E:/Source-code/appleidmore/苹果png/80x80.PNG",
-                        "spotlight@3x" : "E:/Source-code/appleidmore/苹果png/120x120.PNG"
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                    }
                }
            },
            "splashscreen" : {
                "iosStyle" : "storyboard",
                "ios" : {
-                    "storyboard" : "E:/Source-code/deming/static/CustomStoryboard.zip"
+                    "storyboard" : "../deming-uniapp/static/CustomStoryboard.zip"
                },
-                "androidStyle" : "default",
+                "androidStyle" : "common",
                "android" : {
-                    "hdpi" : "E:/Source-code/deming/static/app/start/480x762.png",
-                    "xhdpi" : "E:/Source-code/deming/static/app/start/720x1242.png",
-                    "xxhdpi" : "E:/Source-code/deming/static/app/start/1080x1882.png"
+                    "hdpi" : "../deming-uniapp/static/app/start/480x762.png",
+                    "xhdpi" : "../deming-uniapp/static/app/start/720x1242.png",
+                    "xxhdpi" : "../deming-uniapp/static/app/start/1080x1882.png"
                }
            }
        }
--- a/pages.json
+++ b/pages.json
@@ -13,6 +13,30 @@
 				}
 			}
 		},
+		{
+			"path": "pages/login/agreements",
+			"style": {
+				"navigationBarTitleText": "用户协议",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/login/privacy_policy",
+			"style": {
+				"navigationBarTitleText": "隐私政策",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/release/tosign",
 			"style": {
@@ -49,7 +73,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "德铭阳光在线",
+				"navigationBarTitleText": "德铭阳光商家",
 				"app-plus": {
 					"titleNView": {
 						"backgroundColor": "#FFFFFF",
@@ -222,6 +246,18 @@
 				}
 			}
 		},
+		{
+			"path": "pages/user/feedback",
+			"style": {
+				"navigationBarTitleText": "用户反馈",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"titleColor": "#333333"
+					}
+				}
+			}
+		},
 		{
 			"path": "pages/user/complaintDetails",
 			"style": {
@@ -313,6 +349,5 @@
 			"text": "我的",
 			"selectedColor": "#FBFBFB"
 		}]
-
 	}
 }
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -16,19 +16,19 @@
 			</view>	
 		</view>
 		<u-radio-group class="box" v-model="value" v-if="type>3">
-			<view class="goods-info" v-for="list in info.refund_list">
-				<image :src="list.goods_image"></image>
+			<view class="goods-info" v-for="list in info.goods_list">
+				<image :src="list.image_480_url"></image>
 				<view class="info-right">
 					<view class="name u-line-1">{{ list.goods_name }}</view>
 					<view class="info">
 						<view class="num">共{{ list.goods_num }}件商品</view>
 						<view class="price">
-							实付
-							<span>￥{{ list.refund_amount }}</span>
+                            {{ type == 10 ? "待支付" : "实付" }}
+							<span>￥{{ list.goods_pay_price }}</span>
 						</view>
 					</view>
 				</view>
-				<u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange">
+				<!-- <u-radio :name="list.refund_id" v-if="type==4" shape="circle" @change="radioGroupChange"> -->
 				</u-radio >
 			</view>
 		</u-radio-group>
@@ -43,16 +43,20 @@
 				</view>
 				<view>
 					<view class="title">手机号</view>
-					<view class="value">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
+					<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
 				</view>
 				<view>
 					<view class="title">收货地址</view>
-					<view class="value u-line-1">{{ info.extend_order_common.reciver_info.address }}</view>
+					<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
 				</view>
                <view>
                    <view class="title">派送方式</view>
                    <view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
                </view>
+                <view class="remark">
+                    <view class="title">订单备注</view>
+                    <view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
+                </view>
                <view @click="showInvoice">
                    <view class="title">开具发票</view>
                    <view class="invoice">
@@ -80,11 +84,11 @@
 			</view>
 		</view>
 		<!-- 待处理 -->
-		<view class="delivery" v-if="type == 1">
+		<view class="delivery" v-if="type == 1 && cur != -1">
 			<view class="title">派送方式</view>
 			<view class="methods">
-				<view :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
-				<view :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
+				<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 0 }" @click="pushstyleA">快递</view>
+				<view :style="{'color': this.cur == -1 ? '#333' : '' }" :class="{ active: cur == 1 }" @click="pushstyleB">骑手</view>
 				<view :class="{ active: cur == 2 }" @click="pushstyleC">自提</view>
 			</view>
 			<view v-if="pushstyleBshow && (pushid || selctcar)" >
@@ -142,6 +146,38 @@
 		<view class="refund" v-if="type == 5 ">退款状态:同意退款，请注意查收！</view>
 		<view class="refund" v-if="type == 6 ">退款状态:商家同意退款，等待后台处理！</view>
 		<view class="refund" v-if="type == 7 ">退款状态:商家拒绝退款，请等待客服联系！</view>
+		<view class="pain-box" v-if="type == 10 ">
+            <view class="info-container">
+            	<view>
+            		<view class="title">姓名</view>
+            		<view class="value">{{ info.extend_order_common.reciver_name }}</view>
+            		<image src="/static/image/home/chat.png" @click="tochat(info.buyer_id)"></image>
+            	</view>
+            	<view>
+            		<view class="title">手机号</view>
+            		<view class="value" @longtap="longtap(info.extend_order_common.reciver_info.mob_phone)">{{ info.extend_order_common.reciver_info.mob_phone }}</view>
+            	</view>
+            	<view>
+            		<view class="title">收货地址</view>
+            		<view class="value u-line-2" @longtap="longtap(info.extend_order_common.reciver_info.address)">{{ info.extend_order_common.reciver_info.address }}</view>
+            	</view>
+                <view>
+                    <view class="title">派送方式</view>
+                    <view class="value u-line-1">{{ users_type == 0 ? "-" : users_type == 1 ? "快递" : users_type == 2 ? "骑手" : "自提" }}</view>
+                </view>
+                <view class="remark">
+                    <view class="title">订单备注</view>
+                    <view class="value" @longtap="longtap(info.extend_order_common.order_message)">{{ info.extend_order_common.order_message }}</view>
+                </view>
+                <view @click="showInvoice">
+                    <view class="title">开具发票</view>
+                    <view class="invoice">
+                        <text>{{ is_invoice ? "是" : "否" }}</text>
+                        <u-icon name="arrow-right" color="#999" size="20" style="margin-left: 10rpx;"></u-icon>
+                    </view>
+                </view>
+            </view>
+        </view>
 		<u-popup v-model="showDelivery" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">骑手信息</view>
 			<view class="input-info">
@@ -276,6 +312,7 @@ export default {
 		this.type = option.type;
 		// console.log(this.type)
 		this.orderid = option.id;
+        
 		this.resetinfo();
 		if (this.type == 1) {
 			// 获取快递公司
@@ -330,26 +367,39 @@ export default {
 			this.refundid = e
 			console.log(e);
 		},
+        pushstyle(index) {
+            // console.log(this.users_type);
+            if (this.users_type == 1 && index == 1) {
+                this.showcompany = true;
+            } else if (this.users_type == 2 && index == 2) {
+                this.show = true;
+            } else if (this.users_type == 3 && index == 3) {
+                this.cur = 2;
+            }
+        },
 		// 人工配送
 		pushstyleA() {
-
-			if(this.cur != 0){
+			console.log(this.cur)
+			if(this.cur != 0 && this.cur != -1){
 				return ;
 			}
+			this.cur = 0;
 			this.showcompany = true;
 		},
 		// 选择骑手
 		pushstyleB() {
-			if(this.cur != 1){
+			if(this.cur != 1 && this.cur != -1){
 				return ;
 			}
+			this.cur = 1;
 			this.show = true;
 		},
-		// 选择骑手
+		// 自提
 		pushstyleC() {
-			if(this.cur != 2){
+			if(this.cur != 2 && this.cur != -1){
 				return ;
 			}
+			this.cur = 2;
 			this.pushstyleBshow = true
 		},
 		// 获取物流公司列表
@@ -379,7 +429,8 @@ export default {
                })
                return
            }
-            this.showExpress = false;
+			this.showExpress = false;
+			this.pushstyleBshow = true
        },
 		// 取消退款
 		cancel() {
@@ -389,14 +440,15 @@ export default {
 		//
 		confirm() {
 			this.showRefunds = false;
-            if (!this.refundid) {
-                this.$refs.uToast.show({
-                	title: "请选择商品",
-                	type: "warning"
-                });
-                return;
-            }
+            // if (!this.refundid) {
+            //     this.$refs.uToast.show({
+            //     	title: "请选择商品",
+            //     	type: "warning"
+            //     });
+            //     return;
+            // }
 			if (this.cur == 0) {
+                console.log(this.refundid);
 				// 确定退款
 				this.$u.api.refund({
 					refund_id: this.refundid,
@@ -547,6 +599,7 @@ export default {
 		// 选择骑手
 		getselect(e) {
 			this.selctcar = this.list[e[0].value];
+			this.pushstyleBshow = true
 		},
 		// 获取订单信息
 		resetinfo() {
@@ -567,11 +620,14 @@ export default {
 					this.is_invoice = this.invoiceList.invoice_id || false;
 					this.invoice_type = this.invoiceList.invoice_type;
 					this.ordered_type = res.data.store_deliver_type; // 发货方式
+                    // console.log(this.users_type,this.cur);
 					// 骑手
 					this.takeawayer_info = res.data.takeawayer || {}; // 骑手信息
 					// 自提
 					this.mineBy_img = res.data.extend_order_common.sendimg; // 自提图片
 					this.mineBy_text = res.data.extend_order_common.deliver_explain; // 自提备注
+                    // 退款id
+                    this.refundid = res.data.refund_list[0].refund_id;
 					// console.log(this.invoiceList,this.is_invoice,this.invoice_type);
 				}
 			});
@@ -599,6 +655,15 @@ export default {
                urls: this.mineBy_img,
                current: 1
            })
+        },
+        // 复制到粘贴板
+        longtap(text) {
+            console.log(text);
+            uni.setClipboardData({
+                data: text,
+                success: (res) => {
+                }
+            });
        }
 	}
 };
@@ -745,10 +810,16 @@ export default {
 			padding: 0 30rpx;
 			background-color: #ffffff;
 			margin-bottom: 20rpx;
+            .remark {
+                padding: 10rpx 0;
+                height: 100%;
+                min-height: 88rpx;
+            }
 			> view {
-				height: 88rpx;
 				display: flex;
 				align-items: center;
+				height: 88rpx;
+                padding: 10rpx 0;
 				color: rgba(51, 51, 51, 1);
 				&:not(:last-child) {
 					border-bottom: 2rpx solid #ececec;
@@ -774,6 +845,46 @@ export default {
 			}
 		}
 	}
+    .pain-box {
+        .info-container {
+            padding: 0 30rpx;
+            margin-bottom: 20rpx;
+            background-color: #ffffff;
+            .remark {
+                padding: 10rpx 0;
+                height: 100%;
+                min-height: 88rpx;
+            }
+            > view {
+                display: flex;
+                align-items: center;
+                height: 88rpx;
+                padding: 10rpx 0;
+                color: rgba(51, 51, 51, 1);
+                &:not(:last-child) {
+                    border-bottom: 2rpx solid #ececec;
+                }
+                .title {
+                    width: 150rpx;
+                    font-size: 30rpx;
+                    margin-right: 10rpx;
+                }
+                .value {
+                    font-size: 26rpx;
+                    flex: 1;
+                }
+                .invoice {
+                    margin-left: auto;
+                    font-size: 26rpx;
+                    color: #333;
+                }
+                image{
+                    width: 40rpx;
+                    height: 40rpx;
+                }
+            }
+        }
+    }
 	.delivery {
 		flex: 1;
 		background-color: #ffffff;
@@ -809,11 +920,11 @@ export default {
 		}
 		.btn {
 			position: absolute;
-			bottom: 40rpx;
 			left: 50%;
 			transform: translate(-50%, 0);
 			width: 690rpx;
 			height: 98rpx;
+            margin: 40rpx 0;
 			background: rgba(255, 120, 15, 1);
 			border-radius: 49rpx;
 			font-size: 36rpx;
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -56,6 +56,12 @@
 			</view>
 			<u-empty margin-top="20" v-if="!badlist.length" mode="order"></u-empty>
 		</view>
+        <view v-else-if="current == 7">
+            <view v-for="(item, index) in paidList" :key="index">
+            	<OrderItem :info="item"></OrderItem>
+            </view>
+            <u-empty margin-top="20" v-if="!paidList.length" mode="order"></u-empty>
+        </view>
 		<view class="release-btn" @click="publish">
 			<image src="../../static/image/index/publish.png"></image>
 			<view class="text">发布</view>
@@ -124,7 +130,10 @@ export default {
 				},
 				{
 					name: '退货订单'
-				}
+				},
+                {
+                    name: '待支付订单'
+                }
 			],
 			imageList: [],
 			showSelect: false,
@@ -142,6 +151,7 @@ export default {
 			finshlist: [], //已完成列表
 			badlist: [], //退货列表
 			carlist: [], //可投诉订单列表
+            paidList: [], // 待支付订单
 			reportinfo: null, //投诉信息
 			reportcontent: '', //投诉内容
            del_id: 0, // 删除id
@@ -178,6 +188,7 @@ export default {
 			this.badlist = [];
 			this.badlist = [];
 			this.testlist = [];
+            this.paidList = [];
 		},
 		// 根据current请求不同的接口
 		reset() {
@@ -202,7 +213,10 @@ export default {
 			} else if (current == 6) {
 				// 退货订单
 				this.getallorder(4);
-			}
+			} else if (current == 7) {
+                // 待支付订单
+                this.getallorder(10);
+            }
 		},
 		// 关闭发布弹窗
 		close() {
@@ -332,7 +346,9 @@ export default {
 							this.badlist.push(arr[index]);
 						} else if (type == 5) {
 							this.badlist.push(arr[index]);
-						}
+						} else if (type == 10) {
+                            this.paidList.push(arr[index]);
+                        }
 					}
 				}
 			});
--- a/pages/index/otherdetails.vue
+++ b/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);
--- a/pages/login/agreements.vue
+++ b/pages/login/agreements.vue
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -20,7 +20,7 @@
 				<view class="" v-if="state==0">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghao" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghao" type="text" @blur="getBlurVal" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -30,7 +30,7 @@
 				<view class="" v-else-if="state==1">
 					<view class="labales">
 						<image src="../../static/image/login/login(3).png"></image>
-						<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
+						<input v-model="zhanghaoA" type="text" @blur="getBlurVal1" placeholder="请输入账号" />
 					</view>
 					<view class="labales">
 						<image src="../../static/image/login/login(1).png"></image>
@@ -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,25 @@ export default {
 			zhanghaoA: '',
 			mimaA: '',
 			url: '',
-            phone: "",
-            code: "",
+			phone: "",
+			code: "",
 			state:0,
 			clickstate:false,
-            // 时间
-            timer: null,
-            is_sendcode: false, // 60s
-            time_count: 60,
+			// 时间
+			timer: null,
+			is_sendcode: false, // 60s
+			time_count: 60,
+			consentPact: false,
+			pactList: [
+				{
+					"id" : 1,
+					"text": "《用户协议》"
+				},
+				{
+					"id":2,
+					"text":"《隐私政策》"
+				},
+			]
 		};
 	},
 	methods: {
@@ -91,14 +111,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;
 		},
@@ -128,18 +140,44 @@ export default {
                }
            })
 		},
+        // 失去焦点获取数据
+        getBlurVal(e) {
+            // console.log(e.detail.value);
+            this.zhanghao = this.$u.trim(e.detail.value,"all");
+        },
+        getBlurVal1(e) {
+            this.zhanghaoA = this.$u.trim(e.detail.value,"all");
+            // 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){
-				this.clickstate=true
-			}else{
-				this.$refs.uToast.show({
-					title: "不能重复提交",
-					type: 'error'
-				});
-				return
-			}
+			// if(this.clickstate==false){
+			// 	this.clickstate=true
+			// }else{
+				// 此验证存在逻辑问题,会出现卡死在这里的情况
+				// this.$refs.uToast.show({
+				// 	title: "不能重复提交",
+				// 	type: 'error'
+				// });
+				// return
+			// }
 			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
 			// uni.clearStorage();
 			// 账号登录1达人0商家
@@ -148,7 +186,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'
@@ -199,7 +237,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,10 +246,13 @@ export default {
 						uni.setStorageSync('token', res.data.token);
 						uni.setStorageSync('userinfo', res.data);
 						uni.setStorageSync('rongyun', res.data.rongcloud_token);
-						this.$u.route({
-							url: '/pages/index/index',
-							type: 'switchTab'
-						});
+						// this.$u.route({
+						// 	url: '/pages/index/index',
+						// 	type: 'switchTab'
+						// });
+                        uni.switchTab({
+                            url: '/pages/index/index',
+                        })
 					}
 				});
 			}
@@ -235,7 +276,30 @@ export default {
        },
        moveHandle(){
            return;
-        }
+		},
+		viewAgreement(id) {
+			console.log(id);
+			if (id == 1) {
+				this.$u.route({
+					url: '/pages/login/agreements',
+					params: {
+						id:1,
+						title: "用户协议"
+					}
+				});
+			}
+			
+			if (id == 2) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						id:2,
+						title: "隐私政策"
+					}
+				});
+			}
+		}
+
 	},
 	onLoad() {
 		let token = uni.getStorageSync('token');
@@ -247,7 +311,7 @@ export default {
 				type: user.role == 2 ? 'tab' : 'to'
 			});
 		}
-	}
+	},
 };
 </script>

@@ -314,7 +378,7 @@ export default {
 .title {
 	font-size: 36rpx;
 	font-weight: bold;
-	margin-bottom: 150rpx;
+	margin-bottom: 120rpx;
 	color: #fff;
 	display: flex;
 	justify-content: flex-start;
@@ -358,9 +422,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;
@@ -397,27 +466,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;
-	padding-left: 40rpx;
+	width: 670rpx;
+	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 {
--- a/pages/login/privacy_policy.vue
+++ b/pages/login/privacy_policy.vue
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -149,7 +149,6 @@ export default {
 		this.getLiveSpec();
        
        this.device = uni.getSystemInfoSync(); // 获取信息
-        console.log(this.device);
 	},
 	methods: {
 		publish() {
@@ -158,7 +157,7 @@ export default {
 			for (let index in arr) {
 				newarr.push(arr[index].file_id);
 			}
-			console.log(this.imgarrA);
+			console.log(this.imgarrA,newarr);
 			this.$u.api
 				.publishphoto({
 					article_title: this.form.name,
--- a/pages/release/tosign.vue
+++ b/pages/release/tosign.vue
@@ -13,7 +13,7 @@
 			<view id="content_tosign">
 				<u-form :model="form" ref="uForm">
 					<u-form-item label-position="right">
-						<u-input v-model="max"  :placeholder="userinfo.rple != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
+						<u-input v-model="max"  :placeholder="userinfo.role != 4 ? '优秀的标题可以卖的更好哦~' : '优秀的标题可以吸引更多人观看哦~'" />
 					</u-form-item>
 					<view class="values"><text>{{this.titleMaxLength - this.max.length}}</text>/20</view>
 					<u-form-item label-position="right">
@@ -28,7 +28,7 @@
 				<!-- 标签的引入 -->
 				<tap_tosign :fileListes="fileListes" @chuangjian="chuangjian" @qiehuan="qiehuan"></tap_tosign>
 				<view class="titles">直播封面图</view>
-				<u-upload :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile'  name="article_cover" :header="{'Authorization' : 'Bearer' +  ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
+				<u-upload ref="upload" :form-data="{'name':'article_cover'}" action='https://mall.dmygkeji.com/storeapi/Upload/uploadFile'  name="article_cover" :header="{'Authorization' : 'Bearer' +  ' ' + token}" :max-count="1" :show-progress="true" @on-change="tupian" @on-success="sccg" del-color="#ececec" upload-text="上传" del-bg-color="#fff" :before-upload="shangchuan"></u-upload>
 			</view>
 			<view class="button-uview">
 				<u-button :hair-line="false" @click="kaibo">{{relerest}}</u-button>
@@ -112,9 +112,19 @@
 			tupian(a){
                // console.log(JSON.parse(a.data));
                let info = JSON.parse(a.data);
-                console.log(info.data);
+                console.log(info);
 				// console.log(JSON.stringify(a.data))
+				if(info.errCode == 1){
+					this.$refs.uToast.show({
+						title: info.message,
+						type: 'error'
+					});
+					this.$refs.upload.clear()
+					return ;
+
+				}
 				this.image = info.data.file_name;
+
 			},
 			navto(url){
 				this.$u.route({
@@ -179,6 +189,7 @@

 			this.token = uni.getStorageSync('token');
 			this.userinfo = uni.getStorageSync("userinfo")
+            console.log(this.userinfo)
 			 var config = {
                appkey: 'mgb7ka1',
                debug:true
--- a/pages/release/video.vue
+++ b/pages/release/video.vue
@@ -42,7 +42,7 @@
 			<view class="titles">正文</view>
 			<view class="titles_border"><textarea placeholder="请输入内容..." v-model="form.intro"></textarea></view>
 			<view class="show_two">
-				<u-popup v-model="show_two" mode="bottom" :closeable="true">
+				<u-popup v-model="show_two" mode="bottom" @close="closeGood" :closeable="true">
 					<view class="title"><text>选择商品</text></view>
 					<!-- 商品列表 -->
 					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll">
@@ -61,7 +61,7 @@
 					<view class="u-button" @click="changes()">确定</view>
 				</u-popup>
 				<!-- 底部选择商品列表 -->
-				<view @click="show_two = true" v-if="userinfo.role != 4">
+				<view @click="selectGoods" v-if="userinfo.role != 4">
 					选择商品
 					<image class="images" src="../../static/image/tosign/bhottom.png"></image>
 				</view>
@@ -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
-		SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
+		SecretId: 'AKID7z1lFeo0tV9YmmvZ52mrxlNmvqHTcuCF', //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 {
@@ -146,6 +153,7 @@ const cImage = _this => {
 		count: 1,
 		sourceType: ['camera', 'album'],
 		success: function(res) {
+            // _this.is_video = true;
 			uni.showLoading({
 				title: '上传中'
 			});
@@ -286,6 +294,15 @@ export default {
 				this.selectarr.push(this.fileListes[num].id);
 			}
 		},
+        // 选择商品
+        selectGoods() {
+            this.show_two = true;
+            this.is_video = true;
+        },
+        // 选择商品弹窗关闭
+        closeGood() {
+            this.is_video = false;
+        },
 		// 创建标签
 		addLiveSpec() {
 			this.$u.api.createLivesp({
--- a/pages/release/zhibo.nvue
+++ b/pages/release/zhibo.nvue
@@ -47,7 +47,7 @@
        <image v-if="zhibo" class="closeimg" src="../../static/image/close.png" @click="closes"></image>
        <image v-if="zhibo" class="menuimg" src="../../static/image/menu.png" @click="tool = true"></image>
        <image v-if="zhibo && list.length != 0" class="shoptapimg" @click="xianshi" src="../../static/image/shop.png" ></image>
-        <text v-if="zhibo" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
+        <text v-if="zhibo && fen" style="font-size:26rpx;color:#fff;width:512rpx;position:fixed;left:30rpx;top:793rpx;">本平台提倡绿色健康直播，严禁在平台内外出现诱导未成年人诈骗、赌博、低俗色情、吸烟酗酒等不当行为，若有违反，将向相关部门依法追究您的法律责任。如因此给平台造成损失，有权向您全额追偿。
        </text>
        <div v-if="zhibo" class="danmulist">
            <text class="danmuitem" v-for="(i,j) in danmulist" :key="j">{{i.senderNickname}}:{{i.content}}</text>
@@ -139,8 +139,8 @@
    font-size: 30rpx;
    color:#fff;
    width: 350rpx;
-    position: fixed;
-    top: 70rpx;
+    position: absolute;	
+	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;
@@ -344,10 +348,13 @@
    width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
    color: #fff;
    flex-direction: column-reverse;
+	/* #ifndef APP-PLUS-NVUE */
    word-wrap:anywhere;
+	/* #endif */
+    font-weight: bold;
 }
 .livePusher{
    width: 750rpx;
@@ -374,7 +381,9 @@
            danmulist:[],
            zhibo:true,
            jieshu:{},
-            renshumax:0
+            renshumax:0,
+            changeLiveRealtimeNumber:{},
+            fen:true
        },
        onLaunch: function() {
            console.log('App Launch');
@@ -386,9 +395,16 @@
            this.stop()
            this.startPreview()
            this.start()
+            // var message = {
+            // 	senderNickname : this.room.currentUser.nickname ,
+            // 	type : 1,
+            // 	content : '重连'
+            // }
+            // this.chatRoomService.sendMessages(this.room.id, message);
        },
        onHide: function() {
            console.log('App Hide');
+            this.chatRoomService.warrings = ()=>{};
        },
        //模拟onshow生命周期
        created() {
@@ -438,6 +454,7 @@
            return true;  
        }, 
        onLoad(a){
+            
 		    console.log(getApp().globalData.im)
            uni.setKeepScreenOn({
                keepScreenOn: true
@@ -448,6 +465,7 @@
            console.log('Bearer' + " " + token)
            this.chatroom_id = a.id
            this.live_id = a.live_id
+            
            uni.request({
                url:"https://mall.dmygkeji.com/storeapi/Streaming/liveStreamList",
                method:"POST",
@@ -489,6 +507,7 @@
                    that.chatRoomService.warrings = that.jinggao
                    //获取当前聊天室数据
                    that.room = that.chatRoomService.room;
+                    console.log(that.room)
                    that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                }
            })
@@ -501,6 +520,9 @@
                miao = parseInt(miao)
                miao = miao + 1 
                // console.log(miao)
+                if(fen > 0){
+                    that.fen = false;
+                }
                if(miao == 60){
                    miao = 0;
                    fen +=1
@@ -520,6 +542,24 @@
                }
                that.time = shi + ":" + fen + ":" + miao
            }, 1000);
+            setInterval(()=>{
+                    console.log("定时")
+                    uni.request({
+                        url:"https://mall.dmygkeji.com/storeapi/Streaming/changeLiveRealtimeNumber",
+                        method:"POST",
+                        header:{
+                            'Authorization' : 'Bearer' + " " + token
+                        },
+                        data:{
+                            live_id:that.live_id,
+                            realtime_number: that.room.onlineUsers.users.length - 1 < 0 ? 0 : that.room.onlineUsers.users.length - 1
+                        },
+                        success(res){
+                            console.log(JSON.stringify(res))
+                        }
+                    })
+                 },
+            10 * 1000)
            // var roomToken = JSON.parse(options.roomToken);
 	

@@ -635,6 +675,8 @@
                    });
                    return ;
                }
+                this.chatRoomService.warrings = ()=>{};
+
                const token = uni.getStorageSync('token');
                let that = this
                console.log(that.url)
--- a/pages/user/contentDetails.vue
+++ b/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>
--- a/pages/user/feedback.vue
+++ b/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>
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -6,16 +6,16 @@
                <view class="name">
                    <text>{{info.member_nickname==null?"新用户":info.member_nickname}}</text>
                    <text>账号：{{info.member_name}}</text>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                </view>
            </view>
            <image src="/static/image/user/1.png"></image>
        </view>
        <view class="nav" @click="toOthersPage('fans')">
 			<text>我的粉丝</text>
-			<image src="/static/image/user/1.png"></image>
+			<image src="/static/image/user/1.png"></image> 
 		</view>
-		<view class="nav" @click="toOthersPage('content')">
+		<view class="nav" @click="toOthersPage('content')"> 
 			<text>内容管理</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -23,6 +23,20 @@
 			<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(0)">
+			<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="clearCache">
 			<text>清除缓存</text>
            <text>{{ fileSizeString }}</text>
@@ -50,18 +64,17 @@ export default {
    watch: {
        isLoginOut() {
            // console.log(this.isLoginOut);
-            if (this.isLoginOut) {
-                uni.hideTabBar();
-            } else {
-                setTimeout(function() {
-                    uni.showTabBar();
-                },200)
-            }
+            // if (this.isLoginOut) {
+            //     uni.hideTabBar();
+            // } else {
+            //     setTimeout(function() {
+            //         uni.showTabBar();
+            //     },200)
+            // }
        }
    },
 	onLoad() {
        this.getCache();
-        console.log(222);
 	},
 	onShow() {
 		this.getmyinfo()
@@ -101,8 +114,8 @@ export default {
                        plus.cache.clear(function(e) {
                            console.log(e);
                        })
+                        this.getCache();
                    }
-                    this.getCache();
                }
            })
            // #endif
@@ -139,7 +152,27 @@ export default {
 			uni.navigateTo({
 				url: '/pages/user/' + url
 			});
-		}
+        },
+
+        viewAgreement(index) {
+			if (index == 0) {
+				this.$u.route({
+					url: '/pages/login/agreements',
+					params: {
+						id: 1,
+						title: "用户协议"
+					}
+				});
+			}
+			if (index == 1) {
+				this.$u.route({
+					url: '/pages/login/privacy_policy',
+					params: {
+						title: "隐私政策"
+					}
+				});
+			}
+        }
 	},
 }
 </script>
@@ -160,6 +193,7 @@ export default {
            align-items: center;
            
            >image{
+                flex-shrink: 0;
                width: 110rpx;
                height: 110rpx;
                border-radius: 50%;
--- a/pages/user/info.vue
+++ b/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">
@@ -37,6 +38,7 @@ export default {
        this.role = userinfo.role;
        // console.log(this.role);
 	},
+    // 保存信息
 	onNavigationBarButtonTap() {
 		let that = this;
 		let obj ={
@@ -86,7 +88,13 @@ export default {
 		},
 		// 获取图片,上传图片
 		chooseImage(sourceType) {
-			let that = this
+			let that = this;
+            let photo_type = "";
+            if (this.role == 2) {
+                photo_type = "store_avatar"
+            } else {
+                photo_type = "avatar"
+            }
 			const token = uni.getStorageSync('token');
 			uni.chooseImage({
 				count: 1,
@@ -97,20 +105,24 @@ export default {
 					uni.uploadFile({
 						url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile',
 						filePath: tempFilePaths[0],
-						name: 'avatar',
+						name: photo_type,
 						formData:{
-							name:"avatar"
+							name: photo_type,
+                            store_id: that.info.store_id
 						},
 						header:{
 							Authorization:'Bearer' + " " + token
 						},
 						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)
-						}
+						},
+                        fail: (res) => {
+                            console.log(res);
+                        }
 					});
 				}
 			});
--- a/pages/user/myinfo.vue
+++ b/pages/user/myinfo.vue
@@ -2,11 +2,11 @@
    <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>
-                    <text>个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
+                    <text class="u-line-2">个性签名：{{info.signature==""?"该用户很懒没有签名！":info.signature}}</text>
                </view>
            </view>
            <image src="/static/image/user/1.png"></image>
@@ -111,12 +111,12 @@ export default {
 						confirmColor: "#f00",
 						success: (res) => {
 								// console.log(res);
-								if (res.confirm) {
-										plus.cache.clear(function(e) {
-												console.log(e);
-										})
-								}
-								this.getCache();
+                            if (res.confirm) {
+                                plus.cache.clear(function(e) {
+                                    console.log(e);
+                                })
+                                this.getCache();
+                            }
 						}
 				})
 				// #endif
@@ -278,6 +278,7 @@ export default {
            align-items: center;
            
            >image{
+                flex-shrink: 0;
                width: 110rpx;
                height: 110rpx;
                border-radius: 50%;
--- a/static/chatservice.js
+++ b/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'
    });

--- a/static/image/shop.png
+++ b/static/image/shop.png
--- a/static/image/shopback.png
+++ b/static/image/shopback.png
--- a/static/imservice.js
+++ b/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;
Author	SHA1	Message	Date
亓雪峰	6ed8f3b89e	Update index.vue	2020-12-07 17:13:37 +08:00
亓雪峰	fabea38a47	Update manifest.json	2020-12-07 17:13:34 +08:00
亓雪峰	1ac89c4f88	用户协议和隐私政策	2020-12-03 21:50:39 +08:00
qxf	3c154f1416	Merge pull request 'qxf' (#116 ) from qxf into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/116	2020-12-01 18:03:14 +08:00
亓雪峰	3325704faa	Merge branch 'master' of https://git.luyuan.tk/luyuan/demingshangjia into qxf	2020-12-01 18:01:46 +08:00
亓雪峰	125c198f5d	优化用户协议与隐私政策	2020-12-01 17:55:49 +08:00
亓雪峰	1e06c5067f	隐私政策修改	2020-11-30 14:43:34 +08:00
hansu	aad77ed2cb	Merge pull request '用户协议，隐私政策分开显示' (#115 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/115	2020-11-27 17:38:55 +08:00
ghusermoon	365c797e28	用户协议，隐私政策分开显示	2020-11-27 17:38:15 +08:00
hansu	a50daa3326	Merge pull request '添加用户隐私协议' (#114 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/114	2020-11-27 14:09:36 +08:00
ghusermoon	d47a2b7740	添加用户隐私协议	2020-11-27 14:07:25 +08:00
qxf	e405a2bd2b	Merge pull request 'qxf' (#113 ) from qxf into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/113	2020-11-27 11:41:50 +08:00
亓雪峰	42b5488a52	登录时检查网络	2020-11-27 11:40:33 +08:00
亓雪峰	99ab0696ba	登录时检查网络连接是否正常	2020-11-27 11:36:15 +08:00
亓雪峰	02d289b31d	Update manifest.json	2020-11-27 11:27:43 +08:00
hansu	ab87f8822b	Merge pull request '添加用户反馈模块' (#112 ) from zhy into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/112	2020-11-25 16:26:51 +08:00
ghusermoon	6945c21f10	添加用户反馈模块	2020-11-25 16:25:32 +08:00
亓雪峰	1529dcb6e6	Update login.vue	2020-11-09 17:43:58 +08:00
亓雪峰	da02e25fd1	修复网络不通的情况下登录卡死的问题	2020-11-09 17:34:14 +08:00
亓雪峰	005ae548a8	修复编译nvue文件样式报错的问题	2020-11-09 09:48:34 +08:00
亓雪峰	c330638827	修复腾讯云cos配置失效的问题	2020-11-09 09:47:18 +08:00
亓雪峰	812bb07e1e	修复更换头像刷新不及时的问题	2020-10-17 09:52:15 +08:00
亓雪峰	b139bf1224	仅主评论可回复	2020-10-15 22:53:10 +08:00
亓雪峰	5757c4bce3	使用达人账号登录改为展示达人名称	2020-10-15 22:52:53 +08:00
亓雪峰	8aab721c0e	修复骑手派送传参问题	2020-10-15 21:20:04 +08:00
亓雪峰	2d76a8ea63	Update chatservice.js	2020-10-14 23:22:46 +08:00
亓雪峰	dfd9fb1b67	Update manifest.json	2020-10-14 15:31:40 +08:00
luyuan	ee6e4102b6	Merge pull request '更换' (#111 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/111	2020-09-25 17:43:48 +08:00
luyuan	9e8d4d4b58	更换	2020-09-25 17:41:56 +08:00
gyh	055cdb654a	Merge pull request 'gdpao' (#110 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/110	2020-09-21 15:04:44 +08:00
Gdpao	e2e5cf8b42	gdpao	2020-09-21 15:03:27 +08:00
gyh	2f1b89c6a6	Merge pull request 'gdpao' (#109 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/109	2020-09-20 18:20:36 +08:00
Gdpao	841dc290b2	gdpao	2020-09-20 18:19:35 +08:00
gyh	0610a0b157	Merge pull request 'gdpao' (#108 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/108	2020-09-19 20:04:32 +08:00
Gdpao	49fe886234	gdpao	2020-09-19 20:02:43 +08:00
luyuan	0f26f6737b	Merge pull request '更换图片' (#107 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/107	2020-09-19 16:15:29 +08:00
luyuan	fb5c8aa476	更换图片	2020-09-19 16:14:56 +08:00
gyh	a732778481	Merge pull request 'gdpao' (#106 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/106	2020-09-18 14:23:48 +08:00
Gdpao	2d7922ff96	gdpao	2020-09-18 14:22:31 +08:00
luyuan	5b3dbd1dc2	Merge pull request '更改了字体修复了10秒消失' (#105 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/105	2020-09-18 09:52:24 +08:00
luyuan	880ce7487b	更改了字体修复了10秒消失	2020-09-18 09:51:48 +08:00
luyuan	a6a65153ea	Merge pull request 'xbx' (#104 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/104	2020-09-17 19:44:21 +08:00
luyuan	c77a7a4d5b	删除了断流提示	2020-09-17 19:18:42 +08:00
luyuan	32bcfb92e1	消除了退出之后的探矿	2020-09-17 19:11:27 +08:00
luyuan	100d4d67b9	一分钟之后文字消失	2020-09-17 19:04:55 +08:00
luyuan	a1d9339948	Merge pull request 'xbx' (#103 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/103	2020-09-16 19:06:03 +08:00
luyuan	a4fee4682f	删除了清楚定时器	2020-09-16 19:05:13 +08:00
luyuan	f74c8a8776	十秒提交一次	2020-09-16 19:01:33 +08:00
gyh	2f62fde4f6	Merge pull request 'gdpas' (#102 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/102	2020-09-16 17:08:29 +08:00
Gdpao	905ae3b9da	gdpas	2020-09-16 11:33:14 +08:00
gyh	341d733a16	Merge pull request 'gdpao' (#101 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/101	2020-09-15 17:41:25 +08:00
Gdpao	c02acd7259	gdpao	2020-09-15 16:46:40 +08:00
luyuan	aa0d7a4a06	Merge pull request '修复了清楚图片' (#100 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/100	2020-09-11 20:43:37 +08:00
luyuan	45b6086398	修复了清楚图片	2020-09-11 20:43:21 +08:00
luyuan	f81ce05547	Merge pull request 'xbx' (#99 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/99	2020-09-11 20:23:56 +08:00
luyuan	fb81800253	涉黄提示	2020-09-11 20:23:34 +08:00
luyuan	1f6d2b4ab3	删除了派送方式	2020-09-11 20:03:26 +08:00
luyuan	52277be0c9	Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-09-11 19:46:31 +08:00
luyuan	f770b05dcd	Merge pull request '修改了热度 => 观看人数' (#98 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/98	2020-09-11 16:46:32 +08:00
gyh	909082f7ca	Merge pull request 'gdpao' (#97 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/97	2020-09-11 15:37:57 +08:00
Gdpao	dadb891236	gdpao	2020-09-11 15:25:57 +08:00
luyuan	42e3c7d6a7	Merge pull request 'xbx' (#96 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/96	2020-09-10 17:21:57 +08:00
gyh	541d8f9f6e	Merge pull request 'gdzb' (#95 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/95	2020-09-10 16:14:22 +08:00
luyuan	5f56b7a27c	Merge pull request 'xbx' (#94 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/94	2020-09-10 16:01:29 +08:00
Gdpao	c270f238bd	gdzb	2020-09-10 14:48:17 +08:00
luyuan	5add00c60a	Merge pull request 'xbx' (#93 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/93	2020-09-10 11:38:51 +08:00