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
29 changed files with 1436 additions and 222 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
@@ -77,7 +77,6 @@ const install = (Vue, vm) => {
 		    return vm.$u.post("/Takeawayer/tryOrderSnList")
 		},
 		// 投诉骑手
-		
 		reportorder({order_id,takeawayer_id,order_list,content}){
 		    return vm.$u.post("/takeawayer/complaintTakeawayer",{order_id,takeawayer_id,order_list,content})
 		},
@@ -114,12 +113,16 @@ const install = (Vue, vm) => {
 		    return vm.$u.post("/order/goodsTryOrderInfo",{goods_try_id})
 		},
 		// 绑定物流订单
-		bindpushid({order_id,shipping_code,shipping_express_id}){
-		    return vm.$u.post("/order/send",{order_id,shipping_code,shipping_express_id})
+		bindpushid({store_deliver_type,order_id,shipping_code,shipping_express_id}){
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,shipping_code,shipping_express_id})
 		},
 		// 绑定骑手
-		bindcarer({order_id,takeawayer_id}){
-		    return vm.$u.post("/order/orderRider",{order_id,takeawayer_id})
+		bindcarer({store_deliver_type,order_id,takeawayer_id}){
+		    return vm.$u.post("/order/send",{store_deliver_type,order_id,takeawayer_id})
+		},
+        // 自提
+        bindmention({store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg}) {
+            return vm.$u.post("/order/send",{store_deliver_type,shipping_express_id,deliver_explain,order_id,sendimg})
        },
 		// 发货物流公司
 		pushcompany(){
@@ -133,6 +136,10 @@ const install = (Vue, vm) => {
 		agreetest({goods_try_id,type,takeawayer_id}){
 			return vm.$u.post("/order/goodsTryAgree",{goods_try_id,type,takeawayer_id})
 		},
+        // 物流
+        getcarinfo({order_id}) {
+            return vm.$u.post("/Order/orderLogistics",{order_id})
+        },

 		messageList({page = 1}){
 			return vm.$u.post("/message/messageList",{page})
@@ -142,6 +149,19 @@ const install = (Vue, vm) => {
 		},
 		messageInfo({id}){
 			return vm.$u.post("/message/messageInfo",{id})
+		},
+        // 达人验证码
+        getCode({member_mobile,smslog_type=2}) {
+            return vm.$u.post("/Sms/sendSmsCode",{member_mobile,smslog_type})
+        },
+        // 达人登录
+        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})
 		}
 		
    }
--- 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": {
@@ -273,6 +309,12 @@
 				}
 			}
 		}
+	    ,{
+            "path" : "pages/index/mention",
+            "style" : {
+                "navigationBarTitleText": "上传凭证"
+            }
+        }
    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -307,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,11 +43,26 @@
 				</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">
+                        <text>{{ is_invoice ? "是" : "否" }}</text>
+                        <u-icon name="arrow-right" color="#999" size="20" style="margin-left: 10rpx;"></u-icon>
+                    </view>
                </view>
 			</view>
 		</view>
@@ -69,13 +84,14 @@
 			</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="cur != 2 && (pushid || selctcar)">
+			<view v-if="pushstyleBshow && (pushid || selctcar)" >
 				<view class="title">{{cur == 0 ? '快递单号':'骑手信息'}}</view>
 				<view class="value">{{ cur == 0 ? pushid ? companyidA.express_name + ": " + pushid : '' : selctcar ? selctcar.label : '' }}</view>
 			</view>
@@ -83,12 +99,42 @@
 		</view>
 		<!-- 已发货 -->
 		<view class="pushtimeline" v-if="type == 2">
+            <view v-if="ordered_type == 1">
                <view class="timelinetitle">物流信息</view>
                <view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
-			<view class="timelinebox" v-for="list in info.express_list">
+                <view class="timelinebox" v-for="(list,index) in info.express_list" :key="index">
                	<view class="timelinecontent">{{list.content}}</view>
                	<view class="timelinetime">{{list.kd_time}}</view>
                </view>
+            </view>
+			<view v-else-if="ordered_type == 2">
+                <view class="timelinetitle">骑手信息</view>
+                <view class="refunds-user-two">
+                    <view>
+                    	<image src="/static/image/home/2.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_name }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/3.png"></image>
+                    	<view>{{ takeawayer_info.takeawayer_mobile }}</view>
+                    </view>
+                    <view>
+                    	<image src="/static/image/home/4.png"></image>
+                    	<view class="address u-line-1">{{ takeawayer_info.company_name }}</view>
+                    </view>
+                </view>
+            </view>
+            <view v-else style="padding-bottom: 20rpx;">
+                <view class="timelinetitle">自提信息</view>
+                <view>
+                    <view class="ziti-title">凭证图片</view>
+                    <image class="certificate-img" :src="mineBy_img" @tap="viewImage" mode="aspectFill"></image>
+                </view>
+                <view>
+                    <view class="ziti-title">备注:</view>
+                    <view class="u-line-5">{{ mineBy_text }}</view>
+                </view>
+            </view>
 		</view>
 		<!-- 已完成 -->
 		<!-- 退款处理 -->
@@ -100,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">
@@ -122,10 +200,10 @@
 			title="请选择公司"
 			confirm-text="下一步"
 		></u-picker>
-		<u-popup v-model="showExpress" mode="center" border-radius="10" class="delivery-popup">
+		<u-popup v-model="showExpress" :mask-close-able="false" mode="center" border-radius="10" class="delivery-popup">
 			<view class="title">填写快递单号</view>
 			<view class="input-info"><input type="text" style="color: #333; line-height: 1;" placeholder="请输入快递单号" v-model="pushid" /></view>
-			<view class="btn" @click="showExpress = false">确认</view>
+			<view class="btn" @click="saveDelivery">确认</view>
 		</u-popup>
 		<u-popup v-model="showRefunds" mode="center" border-radius="10" class="refunds-popup">
 			<view v-if="cur == 1" class="popup-tips">
@@ -143,6 +221,42 @@
 				<view class="determine" @click="confirm">确定</view>
 			</view>
 		</u-popup>
+        <u-popup class="invoice-box" v-model="show_invoice" :mask-close-able="false" mode="center" length="540rpx" border-radius="10">
+            <view class="title">
+                <text>发票信息</text>
+                <u-icon class="close" name="close" @click="show_invoice=false"></u-icon>
+            </view>
+            <view class="info">
+                <view>
+                    <text>发票抬头：</text>
+                    <view class="u-line-2">{{ invoiceList.invoice_title }}</view>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>税号：</text>
+                    <text>{{ invoiceList.invoice_code }}</text>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>单位地址：</text>
+                    <view class="u-line-3">{{ invoiceList.invoice_goto_addr }}</view>
+                </view>
+                <view>
+                    <text>电话号码：</text>
+                    <text>{{ invoiceList.invoice_rec_mobphone }}</text>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>开户银行：</text>
+                    <view class="u-line-3">{{ invoiceList.invoice_reg_bname }}</view>
+                </view>
+                <view v-if="invoice_type==2">
+                    <text>银行账户：</text>
+                    <text>{{ invoiceList.invoice_reg_baccount }}</text>
+                </view>
+                <view v-if="invoice_type==1">
+                    <text>身份证号：</text>
+                    <text>{{ invoiceList.invoice_code }}</text>
+                </view>
+            </view>
+        </u-popup>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -151,7 +265,8 @@ export default {
 	data() {
 		return {
 			status: 1, // 订单状态
-			cur: 2,
+			cur: null,
+      show_invoice: false, // 发票
 			showDelivery: false, // 填写骑手信息
 			showExpress: false, // 填写快递单号
 			showRefunds: false, // 平台退货处理
@@ -181,13 +296,23 @@ export default {
 			companyidA: null, //物流派送公司id
 			companyidB: null, //骑手派送公司id
 			value:"",
-			refundid:null
+			refundid:null,
+			is_invoice: 0, // 判断发票
+			invoice_type: null,
+			invoiceList: {}, // 发票数据
+			users_type: "", // 用户选择发货type
+			ordered_type: 0, // 发货方式的状态
+      takeawayer_info: {}, // 骑手信息
+			mineBy_img: "", // 自提图片
+			mineBy_text: "", // 自提备注
+			pushstyleBshow: false
 		};
 	},
 	onLoad(option) {
 		this.type = option.type;
-		console.log(this.type)
+		// console.log(this.type)
 		this.orderid = option.id;
+        
 		this.resetinfo();
 		if (this.type == 1) {
 			// 获取快递公司
@@ -195,7 +320,7 @@ export default {
 		}
 		if (this.type == 2) {
 			// 获取物流信息
-			this.getcarinfo();
+			// this.getcarinfo();
 		}
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
@@ -242,16 +367,41 @@ 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() {
+			console.log(this.cur)
+			if(this.cur != 0 && this.cur != -1){
+				return ;
+			}
 			this.cur = 0;
 			this.showcompany = true;
 		},
 		// 选择骑手
 		pushstyleB() {
+			if(this.cur != 1 && this.cur != -1){
+				return ;
+			}
 			this.cur = 1;
 			this.show = true;
 		},
+		// 自提
+		pushstyleC() {
+			if(this.cur != 2 && this.cur != -1){
+				return ;
+			}
+			this.cur = 2;
+			this.pushstyleBshow = true
+		},
 		// 获取物流公司列表
 		getcompanyinfo() {
 			let that = this;
@@ -262,6 +412,26 @@ export default {
 				}
 			});
 		},
+        // 查询物流
+        // getcarinfo() {
+        //     this.$u.api.getcarinfo({
+        //         order_id: this.orderid
+        //     }).then(res => {
+        //         console.log(res);
+        //     })
+        // },
+        // 保存订单号
+        saveDelivery() {
+            if (!this.pushid) {
+                uni.showToast({
+                    title: "请填写快递单号！",
+                    icon: "none"
+                })
+                return
+            }
+			this.showExpress = false;
+			this.pushstyleBshow = true
+        },
 		// 取消退款
 		cancel() {
 			this.showRefunds = false;
@@ -270,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,
@@ -346,8 +517,8 @@ export default {
 		},
 		// 绑定配送方式
 		confirmpushstyle() {
-            console.log(this.cur);
-            if (this.cur != 0 && this.cur != 1) {
+			// console.log(this.cur);
+			if (this.cur < 0) {
 					this.$refs.uToast.show({
 							title: '请选择派送方式！',
 							type: 'warning ',
@@ -362,8 +533,9 @@ export default {
 						})
 						return;
 				}
-				console.log(this.pushid);
+				// console.log(this.pushid);
 				this.$u.api.bindpushid({
+          store_deliver_type: 1,
 					order_id: this.orderid,
 					shipping_code: this.pushid,
 					shipping_express_id: this.companyidA.express_id
@@ -383,7 +555,7 @@ export default {
 						});
 					}
 				});
-			} else {
+			} else if (this.cur == 1) {
 				if (!this.selctcar) {
 						this.$refs.uToast.show({
 								title: '请选择派送方式！',
@@ -392,6 +564,7 @@ export default {
 						return;
 				}
 				this.$u.api.bindcarer({
+          store_deliver_type: 2,
 					order_id: this.orderid,
 					takeawayer_id: this.selctcar.takeawayer_id
 				}).then(res => {
@@ -411,11 +584,22 @@ export default {
 						});
 					}
 				});
+			} else {
+					uni.navigateTo({
+							url: "mention?id=" + this.orderid
+					})
+			}
+		},
+		// 显示发票
+		showInvoice() {
+			if (this.is_invoice) {
+					this.show_invoice = true;
 			}
 		},
 		// 选择骑手
 		getselect(e) {
 			this.selctcar = this.list[e[0].value];
+			this.pushstyleBshow = true
 		},
 		// 获取订单信息
 		resetinfo() {
@@ -430,6 +614,21 @@ export default {
 					});
 				} else {
 					this.info = res.data;
+					this.cur = res.data.member_deliver_type - 1;
+					this.users_type = res.data.member_deliver_type; // 用户选择发货方式
+					this.invoiceList = res.data.extend_order_common.invoice_info;
+					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);
 				}
 			});
 			this.$u.api.takeawayerlist({}).then(res => {
@@ -448,6 +647,23 @@ export default {
 					this.list = arr;
 				}
 			});
+		},
+        // 预览图片
+        viewImage() {
+            console.log(this.mineBy_img);
+            uni.previewImage({
+                urls: this.mineBy_img,
+                current: 1
+            })
+        },
+        // 复制到粘贴板
+        longtap(text) {
+            console.log(text);
+            uni.setClipboardData({
+                data: text,
+                success: (res) => {
+                }
+            });
        }
 	}
 };
@@ -535,6 +751,51 @@ export default {
 			}
 		}
 	}
+    .refunds-user-two {
+        padding: 25rpx 0;
+        background-color: #ffffff;
+        margin-bottom: 20rpx;
+        > view {
+        	display: flex;
+        	align-items: center;
+        	justify-content: space-between;
+        	margin-bottom: 30rpx;
+        	@mixin image-class($width, $right) {
+        		> image {
+        			flex-shrink: 0;
+        			width: $width;
+        			height: 40rpx;
+        			margin-right: $right;
+        		}
+        	}
+        	&:first-child {
+        		@include image-class($width: 40rpx, $right: 20rpx);
+        	}
+        	&:nth-child(2) {
+        		margin-left: 4rpx;
+        		@include image-class($width: 32rpx, $right: 24rpx);
+        	}
+        	&:last-child {
+        		margin-left: 2rpx;
+        		@include image-class($width: 36rpx, $right: 22rpx);
+        	}
+        	> view {
+        		flex: 1;
+        		font-size: 26rpx;
+        		color: rgba(51, 51, 51, 1);
+        	}
+        }
+    }
+    .ziti-title {
+        margin: 20rpx 0 10rpx;
+        font-size: 28rpx;
+        color: #333;
+    }
+    .certificate-img {
+        width: 320rpx;
+        height: 240rpx;
+        border-radius: 4rpx;
+    }
 	.user-info {
 		.info-title {
 			font-size: 30rpx;
@@ -549,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;
@@ -566,6 +833,51 @@ export default {
 					font-size: 26rpx;
 					flex: 1;
 				}
+                .invoice {
+                    margin-left: auto;
+                    font-size: 26rpx;
+                    color: #333;
+                }
+				image{
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+		}
+	}
+    .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;
@@ -587,10 +899,11 @@ export default {
 		.methods {
 			display: flex;
 			flex-wrap: wrap;
+            justify-content: space-around;
 			> view {
 				font-size: 30rpx;
-				color: rgba(0, 0, 51, 1);
-				width: 335rpx;
+				color: #999;
+				width: 30%;
 				height: 80rpx;
 				border: 1rpx solid rgba(236, 236, 236, 1);
 				background: rgba(236, 236, 236, 1);
@@ -598,9 +911,6 @@ export default {
 				text-align: center;
 				line-height: 80rpx;
 				margin-bottom: 20rpx;
-				&:nth-child(2n-1) {
-					margin-right: 20rpx;
-				}
 			}
 			.active {
 				border: 1rpx solid #ff780f;
@@ -610,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;
@@ -636,6 +946,7 @@ export default {
 			color: rgba(51, 51, 51, 1);
 		}
 		.timelineid {
+            margin: 18rpx 0;
 			min-height: 40rpx;
 			font-size: 24rpx;
 			font-weight: 400;
@@ -742,5 +1053,35 @@ export default {
 			}
 		}
 	}
+    .invoice-box {
+        .title {
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            padding: 20rpx 20rpx 0 20rpx;
+            text-align: center;
+            .close {
+                margin-left: 180rpx;
+            }
+        }
+        .info {
+            padding: 30rpx;
+            & > view {
+                display: flex;
+                margin: 10rpx 0;
+                & > text:first-child {
+                    flex-shrink: 0;
+                    width: 140rpx !important;
+                    text-align: right;
+                }
+                & > text:last-child {
+                    width: 320rpx !important;
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+            }
+        }
+    }
 }
 </style>
--- 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>
@@ -73,7 +79,7 @@
 		<u-popup v-model="publishstate" mode="bottom">
 			<view class="publish">
 				<view class="list">
-					<view @click="navto('release/tosign')" v-if="0">
+					<view @click="navto('release/tosign')">
 						<image src="../../static/image/index/live.png"></image>
 						<text>直播</text>
 					</view>
@@ -124,6 +130,9 @@ export default {
 				},
 				{
 					name: '退货订单'
+				},
+                {
+                    name: '待支付订单'
                }
 			],
 			imageList: [],
@@ -142,6 +151,7 @@ export default {
 			finshlist: [], //已完成列表
 			badlist: [], //退货列表
 			carlist: [], //可投诉订单列表
+            paidList: [], // 待支付订单
 			reportinfo: null, //投诉信息
 			reportcontent: '', //投诉内容
            del_id: 0, // 删除id
@@ -156,7 +166,7 @@ export default {
 		this.getallorder(0);
 		const user = uni.getStorageSync('userinfo');
 		console.log(user)
-		this.imService.login(user.userId,user.member_nickname,user.member_avatar)
+		this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
 		this.imService.connectIM()
 		// 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货
 	},
@@ -178,6 +188,7 @@ export default {
 			this.badlist = [];
 			this.badlist = [];
 			this.testlist = [];
+            this.paidList = [];
 		},
 		// 根据current请求不同的接口
 		reset() {
@@ -202,6 +213,9 @@ export default {
 			} else if (current == 6) {
 				// 退货订单
 				this.getallorder(4);
+			} else if (current == 7) {
+                // 待支付订单
+                this.getallorder(10);
            }
 		},
 		// 关闭发布弹窗
@@ -294,7 +308,7 @@ export default {
 		getshiftlist() {
 			let that = this;
 			this.$u.api.getshiftlist({}).then(res => {
-				console.log(JSON.stringify(res));
+				// console.log(JSON.stringify(res));
 				if (res.errCode != 0) {
 					this.$refs.uToast.show({
 						title: res.message,
@@ -332,6 +346,8 @@ 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/mention.vue
+++ b/pages/index/mention.vue
@@ -0,0 +1,147 @@
+<template>
+	<view class="container">
+		<view class="upload">
+            <view class="title">
+                <text>上传凭证</text>
+                <text class="tips">（仅可上传1张凭证）</text>
+            </view>
+            <u-upload class="upload-box" :form-data="coverformdata" upload-text="" :action="action" :header="header" name="common" :max-count="1" @on-success="uploadSuc"></u-upload>
+        </view>
+        <view class="remarks">
+            <view>备注:</view>
+            <textarea class="textarea-box" v-model="textareaVal" placeholder="请输入内容..." placeholder-class="placeholder-style" />
+        </view>
+        <u-button class="btn-submit" @click="submitInfo">提交</u-button>
+        <u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+                header: {
+                	Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+                },
+				action: "https://mall.dmygkeji.com/api/Upload/uploadfile",
+                coverformdata: {
+                	name: 'common'
+                },
+                img_url: "", // 图片路径
+                textareaVal: "", // 备注
+			};
+		},
+        onLoad(option) {
+            // console.log(option);
+            this.order_id = option.id;
+        },
+        methods: {
+            // 上传成功
+            uploadSuc(e) {
+                if (e.errCode == 0) {
+                    this.$refs.uToast.show({
+                        title: e.message,
+                        type: "success"
+                    })
+                    // console.log(e.data);
+                    this.img_url = e.data.file_path;
+                } else {
+                    this.$refs.uToast.show({
+                        title: e.message,
+                    })
+                }
+            },
+            // 自提提交
+            submitInfo() {
+                if (!this.img_url) {
+                    this.$refs.uToast.show({
+                        title: "请上传凭证!",
+                        type: "warning"
+                    })
+                    return;
+                }
+                if (!this.$u.trim(this.textareaVal)) {
+                    this.$refs.uToast.show({
+                        title: "请填写备注!",
+                        type: "warning"
+                    })
+                    return;
+                }
+                // 提交
+                this.$u.api.bindmention({
+                    store_deliver_type: 3,
+                    shipping_express_id: "e1000",
+                    deliver_explain: this.textareaVal,
+                    order_id: this.order_id,
+                    sendimg: this.img_url,
+                }).then(res => {
+                    console.log(res);
+                    if (res.errCode == 0) {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: "success",
+                            isTab: "true",
+                            url: "/pages/index/index"
+                        })
+                    } else {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: "warning"
+                        })
+                    }
+                })
+            }
+        }
+	}
+</script>
+
+<style lang="scss">
+.container {
+    padding: 30rpx;
+}
+::v-deep.uicon-plus {
+    font-size: 50rpx !important;
+}
+.upload {
+    .title {
+        display: flex;
+        align-items: center;
+        font-size: 30rpx;
+        font-weight: 400;
+        color: #333;
+        .tips {
+            font-size: 20rpx;
+            color: #999;
+        }
+    }
+    .upload-box {
+        margin: 20rpx 0;
+    }
+}
+.remarks {
+    .textarea-box {
+        width: calc(100% - 42rpx);
+        padding: 20rpx;
+        margin-top: 20rpx;
+        font-size: 28rpx;
+        color: #333;
+        border-radius: 10rpx;
+        border: 1px solid #BABABA;
+    }
+    .placeholder-style {
+        color: #999;
+        font-size: 26rpx;
+    }
+}
+.btn-submit {
+    width: 690rpx;
+    height: 98rpx !important;
+    margin-top: 70rpx;
+    font-size: 36rpx !important;
+    text-align: center;
+    line-height: 98rpx !important;
+    color: #fff !important;
+    border-radius: 50rpx;
+    background-color: #FF780F !important;
+}
+</style>
--- 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
@@ -1,7 +1,7 @@
 <template>
 	<!-- login页面 -->
 	<view>
-		<view class="login">
+		<view class="login" @touchmove.stop.prevent="moveHandle">
 			<!-- <image class="images" :src="url"></image> -->
 			<view class="backes"></view>
 			<view class="title_top">德铭阳光在线-商家端</view>
@@ -11,30 +11,54 @@
 						商家登录
 					</view>
 					<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
-						达人登录
+						商家达人
+					</view>
+                    <view v-bind:class="[state==2 ? 'show' : '']" @click="changetab(2)">
+                    	平台达人
                    </view>
 				</view>
 				<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>
 						<input v-model="mima" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
-				<view class="" v-else>
+				<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>
 						<input v-model="mimaA" type="password" placeholder="请输入密码" />
 					</view>
 				</view>
-
+                <view v-else>
+                    <view class="labales">
+                    	<image src="../../static/image/login/login(3).png"></image>
+                    	<input v-model="phone" type="number" maxlength="11" placeholder="请输入手机号" />
+                    </view>
+                    <view class="labales">
+                    	<image src="../../static/image/login/safe.png"></image>
+                    	<input v-model="code" type="number" placeholder="请输入验证码" />
+                        <u-button class="get-code" :class=" is_sendcode ? 'stopClick' : '' " :disabled="is_sendcode" @click="getCode">
+                            {{ is_sendcode ? time_count + "后可以重新发送" : "发送验证码" }}
+                        </u-button>
+                    </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>
@@ -61,8 +85,25 @@ export default {
 			zhanghaoA: '',
 			mimaA: '',
 			url: '',
+			phone: "",
+			code: "",
 			state:0,
-			clickstate:false
+			clickstate:false,
+			// 时间
+			timer: null,
+			is_sendcode: false, // 60s
+			time_count: 60,
+			consentPact: false,
+			pactList: [
+				{
+					"id" : 1,
+					"text": "《用户协议》"
+				},
+				{
+					"id":2,
+					"text":"《隐私政策》"
+				},
+			]
 		};
 	},
 	methods: {
@@ -70,34 +111,73 @@ 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;
 		},
 		// 获取验证码倒计时
 		getCode() {
-			console.log('11');
-			this.loading();
-		},
-		loading() {},
-		logins() {
-			// 判断是否可以点击
-			if(this.clickstate==false){
-				this.clickstate=true
-			}else{
+            if (!this.$u.test.mobile(this.phone)) {
                this.$refs.uToast.show({
-					title: "不能重复提交",
+                    title: '手机号码有误！',
+                })
+                return;
+            }
+            this.$u.api.getCode({
+                member_mobile: this.phone,
+            }).then(res => {
+                console.log(res);
+                if (res.errCode == 0) {
+                    this.$refs.uToast.show({
+                        title: res.message,
+                        type: 'success',
+                    })
+                    this.getSendCode();
+                } else {
+                    this.$refs.uToast.show({
+                        title: res.message,
+                        type: "warning"
+                    })
+                }
+            })
+		},
+        // 失去焦点获取数据
+        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'
 						});
-				return
 					} 
+			    },
+			});
+			
+			// 不同意协议不让登录
+			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
+			// }
 			// 清除本地存储才可以正常登陆（具体原因没有仔细检查）
 			// uni.clearStorage();
 			// 账号登录1达人0商家
@@ -106,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'
@@ -121,12 +201,43 @@ export default {
 						});
 					}
 				});
-			}else{
+			}else if (this.state == 2) {
+                if (!this.$u.test.mobile(this.phone)) {
+                    this.$refs.uToast.show({
+                        title: '手机号码有误！',
+                    })
+                    return;
+                }
+                if (this.code.length < 4) {}
+                this.$u.api.starLogin({
+                    member_mobile: this.phone,
+                    sms_code: this.code,
+                }).then(res => {
+                    if (res.errCode == 0) {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: 'success',
+                        })
+                        uni.setStorageSync('token', res.data.token);
+                        uni.setStorageSync('userinfo', res.data);
+                        uni.setStorageSync('rongyun', res.data.rongcloud_token);
+                        this.$u.route({
+                        	url: '/pages/user/myinfo',
+                        	type:"redirect"
+                        });
+                    } else {
+                        this.$refs.uToast.show({
+                            title: res.message,
+                            type: "warning"
+                        })
+                    }
+                })
+            } else{
 				this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
 					console.log(JSON.stringify(res))
 					if (res.errCode != 0) {
 						// 恢复按钮可点击状态
-						this.clickstate=false
+						// this.clickstate=false
 						this.$refs.uToast.show({
 							title: res.message,
 							type: 'error'
@@ -135,15 +246,60 @@ export default {
 						uni.setStorageSync('token', res.data.token);
 						uni.setStorageSync('userinfo', res.data);
 						uni.setStorageSync('rongyun', res.data.rongcloud_token);
-						this.$u.route({
+						// this.$u.route({
+						// 	url: '/pages/index/index',
+						// 	type: 'switchTab'
+						// });
+                        uni.switchTab({
                            url: '/pages/index/index',
-							type: 'switchTab'
+                        })
+					}
 				});
 			}
+		},
+        // 60s
+        getSendCode() {
+            const TIME_COUNT = 60;
+            if (!this.timer) {
+                this.time_count = TIME_COUNT;
+                this.is_sendcode = true;
+                this.timer = setInterval(() => {
+                    if (this.time_count > 0 && this.time_count <= TIME_COUNT) {
+                        this.time_count--;
+                    } else {
+                        this.is_sendcode = false;
+                        clearInterval(this.timer);
+                        this.timer = null;
+                    }
+                }, 1000);
+            }
+        },
+        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');
@@ -155,7 +311,7 @@ export default {
 				type: user.role == 2 ? 'tab' : 'to'
 			});
 		}
-	}
+	},
 };
 </script>

@@ -170,6 +326,7 @@ export default {
 	top: 0;
 	left: 0;
 	z-index: -1;/*-1 可以当背景*/
+    transform: scale(1.1);
 	-webkit-filter: blur(3px);
 	filter: blur(3px);
 }
@@ -221,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;
@@ -247,26 +404,43 @@ export default {
 		font-size: 30rpx;
 	}
    
+    .get-code {
+        width: auto !important;
+        height: 60rpx !important;
+        padding: 0 30rpx !important;
+        font-size: 24rpx !important;
+        line-height: 60rpx !important;
+        color: #fff !important;
+        border: none !important;
+        border-radius: 10rpx !important;
+        &::after {
+            border: none !important;
+        }
+    }
+
 	.labales {
+        display: flex;
+        align-items: center;
+		height: 90rpx;
+		line-height: 90rpx;
 		border-bottom: 1px #fff solid;
-		margin-bottom: 180rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		position: relative;
+		&:first-child {
+			margin-bottom: 100rpx;
+		}
+		&:nth-child(2) {
+			margin-bottom: 80rpx;
+		}
 		input {
 			width: 80%;
-			margin-left: 60rpx;
+			margin-left: 30rpx;
 			color: #fff;
 			letter-spacing: 2rpx;
 			background-color: none;
 		}
 	}
 	.labales image {
-		position: absolute;
-		left: 0;
-		top: 0;
-		bottom: 0;
-		width: 39rpx;
+        flex-shrink: 0;
+		width: 38rpx;
 		height: 40rpx;
 	}
 	.labales:nth-child(3) {
@@ -292,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/messages/info.vue
+++ b/pages/messages/info.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image :src="list.picture" class="picture" mode=""></image>
+		<image :src="list.picture" class="picture" mode="widthFix"></image>
        <view class="box">
            <view class="info">
                <text class="title u-line-2">{{ list.title }}</text>
@@ -43,7 +43,7 @@
 page {
 }
 .picture {
-    width: 100%;
+    width: 750rpx;
 }
 .box {
    width: 100%;
--- a/pages/release/index.vue
+++ b/pages/release/index.vue
@@ -137,7 +137,8 @@ export default {
 			selectarr: [], //选中标签
 			tagcontent: '',
 			is_edit: false, // 编辑
-			userinfo:{}
+			userinfo:{},
+            device: null, // 手机信息
 		};
 	},
 	onLoad() {
@@ -146,6 +147,8 @@ export default {

 		this.tosign();
 		this.getLiveSpec();
+        
+        this.device = uni.getSystemInfoSync(); // 获取信息
 	},
 	methods: {
 		publish() {
@@ -154,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,
@@ -277,7 +280,18 @@ export default {
        },
 		// 上传封面
 		uploadcover(data) {
-			console.log(data);
+			// console.log(data.data);
+            // #ifdef APP-PLUS
+            plus.io.getImageInfo({
+                src: data.data.file_path,
+                success: (res) => {
+                    console.log(res);
+                },
+                fail: (err) => {
+                    console.log(err);
+                }
+            })
+            // #endif
 			if (data.errCode != 0) {
 				this.$refs.uToast.show({
 					title: '上传失败',
--- 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="优秀的标题可以卖的更好哦~" />
+						<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">德铭阳光在线绿色直播，请遵循相关法律法规，警察叔叔24小时巡查哦。为了保障直播系统稳定，现将全局开放防主播沉迷功能。主播积累直播16小时将自动下播休息2小时后方可继续开播。请大家注意休息/避免空播。
+        <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>
@@ -73,10 +73,10 @@
        </view>
        </div>
        <div class="jieshu" v-if="!zhibo" :style="{'height':height + 'px'}">
-            <div class="jieshuback" :style="{'height':height + 'px'}"></div>
+            <div class="jieshuback" :style="{'height':height + 'px'}" @click="closes1"></div>
            <image class="closeimg" src="../../static/image/cloneb.png" @click="closes"></image>
            <text class="jieshutitle">徳铭阳光在线</text>
-            <image class="jieshuheadimg" :src="info.member_avatar"></image>
+            <image class="jieshuheadimg" @click="closes1" :src="info.member_avatar"></image>
            <text class="jieshuusername">{{info.member_nickname}}</text>
            <div class="jieshubox">
                <view class="jieshuboxitem">
@@ -84,13 +84,17 @@
                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">新粉丝</text>
                </view>
                <view class="jieshuboxitem">
-                    <text style="color:#fff;font-size:30rpx">{{renshumax}}</text>
-                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">热度</text>
+                    <text style="color:#fff;font-size:30rpx">{{jieshu.headcount}}</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">观看人数</text>
                </view>
                <view class="jieshuboxitem" v-if="list.length != 0">
                    <text style="color:#fff;font-size:30rpx">RMB {{jieshu.sales_amount}}</text>
                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">直播销量</text>
                </view>
+                 <view class="jieshuboxitem" v-if="list.length != 0">
+                    <text style="color:#fff;font-size:30rpx">{{jieshu.buy_num}}</text>
+                    <text style="color:#fff;font-size:30rpx;margin-top:10rpx">购买人数</text>
+                </view>
            </div>
        </div>
        <!-- <button class="btn" @click="start">开始推流1</button>
@@ -134,7 +138,8 @@
 .jieshutitle{
    font-size: 30rpx;
    color:#fff;
-    position: fixed;
+    width: 350rpx;
+    position: absolute;	
 	top: 70rpx;
    left: 31rpx;
    height: 31rpx;
@@ -146,9 +151,9 @@
    left: 0;
    top: 0;
    width: 750rpx;
-    
 }
 .jieshu{
+    z-index: 9999;
    position: fixed;
    top: 0;
    left: 0;
@@ -171,7 +176,7 @@
    bottom: 24rpx;
 }
 .closeimg{
-    position: fixed;
+    position: absolute;
    top: 70rpx;
    right: 31rpx;
    width: 51rpx;
@@ -229,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;
 }
@@ -264,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;
@@ -336,11 +345,16 @@
    position: fixed;
    left: 30rpx;
    bottom: 118rpx;
+    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;
@@ -367,18 +381,30 @@
            danmulist:[],
            zhibo:true,
            jieshu:{},
-            renshumax:0
+            renshumax:0,
+            changeLiveRealtimeNumber:{},
+            fen:true
        },
        onLaunch: function() {
            console.log('App Launch');
        },
        onShow: function() {
+            if(!this.zhibo){
+                return ;
+            }
            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() {
@@ -428,6 +454,7 @@
            return true;  
        }, 
        onLoad(a){
+            
 		    console.log(getApp().globalData.im)
            uni.setKeepScreenOn({
                keepScreenOn: true
@@ -438,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",
@@ -479,6 +507,7 @@
                    that.chatRoomService.warrings = that.jinggao
                    //获取当前聊天室数据
                    that.room = that.chatRoomService.room;
+                    console.log(that.room)
                    that.chatRoomService.initialWhenOnlineUserChange(that.renqu)
                }
            })
@@ -491,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
@@ -510,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);
 	

@@ -591,6 +641,7 @@
                if(res.users.length > this.renqu){
                    this.renqu = res.users.length
                }
+                this.$forceUpdate()
            },
            whenNewMessage (message) {//新消息监听
 				// if(message.type == this.room.MessageType.PROP){
@@ -613,13 +664,19 @@
                    duration: 2000
                });
            },
+            closes1() {
+                console.log(111);
+            },
            closes(){
+                console.log(this.zhibo)
                if(!this.zhibo){
                    uni.navigateBack({
                        delta:1
                    });
                    return ;
                }
+                this.chatRoomService.warrings = ()=>{};
+
                const token = uni.getStorageSync('token');
                let that = this
                console.log(that.url)
--- a/pages/user/complaintDetails.vue
+++ b/pages/user/complaintDetails.vue
@@ -47,6 +47,7 @@ export default {
 			this.$u.api.reportdetail({
 				id: id
 			}).then(res => {
+				console.log(res)
 				if (res.errCode != 0) {
 					this.$refs.uToast.show({
 						title: res.message,
--- 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,7 +6,7 @@
                <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>
@@ -23,11 +23,29 @@
 			<text>骑手投诉</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-		<view class="nav" @click="is_loginout = true">
+        <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>
+		</view>
+		<view class="nav" @click="isLoginOut = true">
 			<text>退出登录</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
-        <u-modal v-model="is_loginout" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
+        <u-modal v-model="isLoginOut" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
 		<u-toast ref="uToast" />
    </view>
 </template>
@@ -37,17 +55,71 @@ export default {
 	data() {
 		return {
 			info:{},
-            is_loginout: false,
+            isLoginOut: false,
            content: "是否退出登录？",
-			num:0
+			num:0,
+            fileSizeString: "", // 缓存大小
+		}
+	},
+    watch: {
+        isLoginOut() {
+            // console.log(this.isLoginOut);
+            // if (this.isLoginOut) {
+            //     uni.hideTabBar();
+            // } else {
+            //     setTimeout(function() {
+            //         uni.showTabBar();
+            //     },200)
+            // }
        }
    },
 	onLoad() {
+        this.getCache();
 	},
 	onShow() {
 		this.getmyinfo()
 	},
 	methods: {
+        // 获取缓存
+        getCache() {
+            let _this = this;
+            // #ifdef APP-PLUS
+            plus.cache.calculate(function(size) {
+                console.log(size);
+                let sizeCache = size;
+                if (sizeCache == 0) {
+                    _this.fileSizeString = "0B";
+                } else if (sizeCache < 1024) {
+                    _this.fileSizeString = sizeCache + "B";
+                } else if (sizeCache < 1048576) {
+                    _this.fileSizeString = (sizeCache / 1024).toFixed(2) + "KB";
+                } else if (sizeCache < 1073741824) {
+                    _this.fileSizeString = (sizeCache / 1048576).toFixed(2) + "MB";
+                } else {
+                    _this.fileSizeString = (sizeCache / 1073741824).toFixed(2) + "GB";
+                }
+            });
+            // #endif
+        },
+        // 清除缓存
+        clearCache() {
+            // #ifdef APP-PLUS
+            uni.showModal({
+                title: "确定要清理缓存吗？",
+                cancelColor: "#999",
+                confirmColor: "#f00",
+                success: (res) => {
+                    // console.log(res);
+                    if (res.confirm) {
+                        plus.cache.clear(function(e) {
+                            console.log(e);
+                        })
+                        this.getCache();
+                    }
+                }
+            })
+            // #endif
+        },
 		// 退出登陆
 		loginOut(){
 			uni.clearStorage();
@@ -80,6 +152,26 @@ 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: "隐私政策"
+					}
+				});
+			}
        }
 	},
 }
@@ -101,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,14 +5,15 @@
 			<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">
 			<text class="title">个性签名</text>
 			<input type="text" value="" v-model="info.signature" placeholder="请输入个性签名"/>
 		</view>
-		<view class="password" @click="updatePwd">
+		<view class="password" @click="updatePwd" v-if="role != 4">
 			<text>修改密码</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
@@ -27,12 +28,17 @@ export default {
 			fileurl: "",
 			filename:"",
 			info:{},
-			num:0
+			num:0,
+            role: 0,
 		};
 	},
 	onLoad() {
-		this.getmyinfo()
+		this.getmyinfo();
+        let userinfo = uni.getStorageSync("userinfo");
+        this.role = userinfo.role;
+        // console.log(this.role);
 	},
+    // 保存信息
 	onNavigationBarButtonTap() {
 		let that = this;
 		let obj ={
@@ -82,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,
@@ -93,19 +105,23 @@ 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,15 +2,19 @@
    <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>
        </view>
+		<view class="nav" @click="navtos()">
+			<text>活动消息</text>
+			<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>
@@ -19,6 +23,10 @@
 			<text>内容管理</text>
 			<image src="/static/image/user/1.png"></image>
 		</view>
+        <view class="nav" @click="clearCache">
+        	<text>清除缓存</text>
+            <text>{{ fileSizeString }}</text>
+        </view>
 		<view class="nav" @click="is_loginout = true">
 			<text>退出登录</text>
 			<image src="/static/image/user/1.png"></image>
@@ -55,24 +63,72 @@ export default {
 	name:"user",
 	data() {
 		return {
-			publishstate:false,
+			publishstate: false,
            is_loginout: false,
            content: "是否退出登录?",
 			info:{},
+            fileSizeString: "", // 缓存大小
 		}
 	},
 	onShow(){
 		this.getmyinfo()
 	},
 	onLoad() {
+        this.getCache();
 		const user = uni.getStorageSync('userinfo');
 		console.log(user)
-		this.imService.login(user.userId,user.member_nickname,user.member_avatar)
+		this.imService.login(user.member_id,user.member_nickname,user.member_avatar)
 		this.imService.connectIM()
 	},
 	methods: {
+		// 获取缓存
+		getCache() {
+				let _this = this;
+				// #ifdef APP-PLUS
+				plus.cache.calculate(function(size) {
+						console.log(size);
+						let sizeCache = size;
+						if (sizeCache == 0) {
+								_this.fileSizeString = "0B";
+						} else if (sizeCache < 1024) {
+								_this.fileSizeString = sizeCache + "B";
+						} else if (sizeCache < 1048576) {
+								_this.fileSizeString = (sizeCache / 1024).toFixed(2) + "KB";
+						} else if (sizeCache < 1073741824) {
+								_this.fileSizeString = (sizeCache / 1048576).toFixed(2) + "MB";
+						} else {
+								_this.fileSizeString = (sizeCache / 1073741824).toFixed(2) + "GB";
+						}
+				});
+				// #endif
+		},
+		// 清除缓存
+		clearCache() {
+				// #ifdef APP-PLUS
+				uni.showModal({
+						title: "确定要清理缓存吗？",
+						cancelColor: "#999",
+						confirmColor: "#f00",
+						success: (res) => {
+								// console.log(res);
+                            if (res.confirm) {
+                                plus.cache.clear(function(e) {
+                                    console.log(e);
+                                })
+                                this.getCache();
+                            }
+						}
+				})
+				// #endif
+		},
+		navtos(){
+			this.$u.route({
+				url:"/pages/messages/list"
+			})
+		},
+    // 退出登录
 		loginOut(){
-			this.imService.disconnect();
+			this.imService.disconnect()
 			uni.clearStorage();
 			this.$refs.uToast.show({
 				title: "退出登陆成功！",
@@ -222,6 +278,7 @@ export default {
            align-items: center;
            
            >image{
+                flex-shrink: 0;
                width: 110rpx;
                height: 110rpx;
                border-radius: 50%;
--- a/static/bg.png
+++ b/static/bg.png
--- 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/login/safe.png
+++ b/static/image/login/safe.png
--- 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;
@@ -784,6 +784,10 @@ IMService.prototype.initialWhenOnlineUserChange = function (whenOnlineUserChange
 IMService.prototype.listenerNewMessage = function () {

    this.im.on(GoEasyIM.EVENT.GROUP_MESSAGE_RECEIVED, (message) => {
+        console.log(message)
+        if(message.senderId == 0){
+            return ;
+        }
 		var content = JSON.parse(message.payload.text);
        this.addNewMessage(message);
        this.whenNewMessage(content);
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	391fda5abc	修改了选择	2020-09-11 19:46:19 +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
luyuan	6d3d176cd8	修改了热度 => 观看人数	2020-09-11 16:43:54 +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
luyuan	8434b1e611	不变型	2020-09-10 17:21:26 +08:00
luyuan	a0ccf26c99	member_id	2020-09-10 17:13:40 +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
luyuan	0c41f85630	修复	2020-09-10 16:01:16 +08:00
luyuan	0087c0c3cd	修复了层次	2020-09-10 15:58:54 +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
luyuan	c236af5986	删除	2020-09-10 11:38:33 +08:00
luyuan	d86dc49da2	修改了标题提示	2020-09-10 11:37:37 +08:00
luyuan	4c8309ca66	Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-09-10 10:05:18 +08:00
luyuan	e173f3c2a8	Merge branch 'xbx' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-09-10 10:05:14 +08:00
luyuan	d0107c5729	临时修复了提示	2020-09-10 10:05:04 +08:00
gyh	1309fec9c3	Merge pull request 'gyh' (#92 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/92	2020-09-10 09:58:33 +08:00
luyuan	b2d7ae4ec5	临时修复了提示	2020-09-10 09:27:12 +08:00
Gdpao	75e02e0228	gdpao	2020-09-10 09:20:30 +08:00
Gdpao	3e8caffe19	gdpaoup	2020-09-07 17:10:24 +08:00
gyh	571489743a	Merge pull request 'gdpao' (#91 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/91	2020-09-07 16:22:45 +08:00
Gdpao	f7f3fee4ad	gdpao	2020-09-07 16:22:11 +08:00
gyh	1f70d8dfcb	Merge pull request 'gdpaoup' (#90 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/90	2020-09-05 20:05:02 +08:00
Gdpao	8c89864beb	gdpaoup	2020-09-05 17:22:53 +08:00
gyh	af908a3dda	Merge pull request 'gdpao' (#89 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/89	2020-09-05 15:32:35 +08:00
luyuan	9ee97373bc	Merge pull request 'xbx' (#88 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/88	2020-09-05 15:28:45 +08:00
Gdpao	388daaa901	gdpao	2020-09-05 12:30:22 +08:00
luyuan	0f85f77520	添加了一个输出	2020-09-05 12:18:05 +08:00
luyuan	23916ea7fa	解决了划走之后的问题	2020-09-05 12:09:57 +08:00
gyh	539309b370	Merge pull request 'GDPAO' (#87 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/87	2020-09-04 19:53:27 +08:00
Gdpao	0824d97080	GDPAO	2020-09-04 19:52:43 +08:00
luyuan	b98baa39aa	Merge pull request '文案' (#86 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/86	2020-09-03 18:08:38 +08:00
luyuan	0619bbd901	文案	2020-09-03 18:08:10 +08:00
luyuan	60cb9294fc	Merge pull request '添加了强制重新渲染' (#85 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/85	2020-09-03 11:45:18 +08:00
luyuan	cd89acf38c	添加了强制重新渲染	2020-09-03 11:44:16 +08:00
gyh	c4114bcfc5	Merge pull request 'gdpao' (#84 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/84	2020-09-03 10:27:40 +08:00
Gdpao	f2e3427260	gdpao	2020-09-03 10:26:55 +08:00
gyh	dbf18d4091	Merge pull request 'gdpao' (#83 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/83	2020-09-02 14:52:12 +08:00
Gdpao	7d066ca67d	gdpao	2020-09-02 14:05:08 +08:00
gyh	22901579b9	Merge pull request 'gdpao' (#82 ) from gyh into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/82	2020-09-01 20:36:06 +08:00
Gdpao	3ecaac3190	gdpaomg	2020-09-01 20:35:48 +08:00
Gdpao	c5b3505dcd	gdpao	2020-09-01 20:32:15 +08:00
luyuan	b9eceb6ecf	Merge pull request '添加了购买人数' (#81 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/81	2020-09-01 17:33:52 +08:00
luyuan	2bdd8e2b7f	添加了购买人数	2020-09-01 16:59:55 +08:00
luyuan	5017534a24	Merge pull request '字体换行' (#80 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/80	2020-09-01 16:55:45 +08:00
luyuan	f9f6bba08b	字体换行	2020-09-01 16:53:49 +08:00
luyuan	2f103eafbe	Merge pull request '修改了大小写' (#79 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/79	2020-09-01 16:15:23 +08:00
luyuan	64824a8fb7	修改了大小写	2020-09-01 16:15:09 +08:00
luyuan	721087e372	Merge pull request '添加活动消息' (#78 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/78	2020-09-01 16:07:09 +08:00
luyuan	164b7f8e4c	Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx	2020-09-01 16:06:27 +08:00
luyuan	a80c2e53b8	添加活动消息	2020-09-01 16:05:34 +08:00
luyuan	f7da2d452c	Merge pull request '添加了直播' (#77 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/77	2020-09-01 11:38:42 +08:00
luyuan	e91b35d1e3	添加了直播	2020-09-01 11:38:18 +08:00