avater

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

common/api/shop.js

@@ -374,6 +374,11 @@ export default {
 			recordAppOpenTimes({appversion,device_type}){
 				// appversion=1.0.0&device_type=android/ios
 				return vm.$u.post("Member/recordAppOpenTimes",{appversion,device_type})
+			},
+			//统计直播间浏览次数
+			// https://mall.dmygkeji.com/api/Live/countLiveBrowse?live_id=1
+			countLiveBrowse({live_id}){
+				return vm.$u.post("Live/countLiveBrowse",{live_id})
 			}
       }
     }

common/api/user.js

@@ -475,9 +475,9 @@ export default {
 				return vm.$u.post("Expertapply/hobbyList")
 			},
 			// 达人申请
-			applyExpert({ name, mobile, address, industry, hobby }) {
+			applyExpert({ name, mobile, idcard, address, industry, hobby }) {
 				return vm.$u.post("Expertapply/expertApply", {
-					name, mobile, address, industry, hobby
+					name, mobile, idcard, address, industry, hobby
 				})
 			},
 			getInvoiceList() {

components/index/zhibo-item/index.vue

@@ -73,6 +73,9 @@ export default {
     },
     methods:{
         zhibo(){
+            this.$u.api.countLiveBrowse({live_id:this.zid}).then((res)=>{
+                console.log(JSON.stringify(res),77)
+            })
             this.$u.route({
                 url:"/pages/zhibo/index",
                params:{
@@ -81,6 +84,7 @@ export default {
                    rid:this.rid
                } 
             })
+            
         },
         articleAddShield() {
             console.log(this.item)

components/mine/order-item/index.vue

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

components/shop/shop-item/index.vue

@@ -33,7 +33,7 @@ export default {
         border-radius: 50%;
     }
     >text{
-		width: 100rpx;
+		max-width: 100rpx;
         margin-top: 14rpx;
         font-size: 24rpx;
         color: #333;

pageC/cart/ConfirmOrder.vue

@@ -49,7 +49,7 @@
 					</view>
 					<view class="remark">
 						<view class="title">订单备注</view>
-						<u-input v-model="remark[index]" type="textarea" :height="88" placeholder="选填" />
+						<u-input v-model="remark[index]" type="textarea" style="margin-top:-5rpx" :height="88" placeholder="选填" />
 					</view>
 				</view>
 				<view class="pick-up" v-if="delivery.type == 3">

pageC/merchant/storeClassify.vue

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

pageE/mine/MineInfo.vue

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

pageE/more/ApplyLive.vue

@@ -3,12 +3,16 @@
     <view class="basic-info">
       <view>
         <label for="name">姓名:</label>
-        <input type="text" id="name"  @input="names" placeholder="请输入姓名" />
+        <input type="text" id="name" @input="names" placeholder="请输入姓名" />
       </view>
       <view>
         <label for="phone">手机号:</label>
         <input type="number" id="phone" @input="phones" maxlength="11" placeholder="请输入手机号" />
       </view>
+      <view>
+        <label for="idCard">身份证号:</label>
+        <input type="text" id="idCard" placeholder="请输入身份证号" @input="setIdCard" />
+      </view>
       <view @click="show=true">
         <label for="address">居住地址:</label>
         <input type="text" id="address" v-model="address" disabled placeholder="请选择居住地址" />
@@ -65,6 +69,7 @@ export default {
       areaList: [],
       name: '',
       phone: '',
+      idCard: '',
       address: '',
       details: '',
       industryList: [],
@@ -87,6 +92,9 @@ export default {
     phones(a){
       this.phone = a.detail.value
     },
+    setIdCard(v) {
+      this.idCard = v.detail.value;
+    },
     detailss(a){
       this.details = a.detail.value
     },
@@ -140,14 +148,22 @@ export default {
         this.$u.toast('手机号错误');
 				return false;
 			}
-			if(this.$u.test.isEmpty(this.address)) {
-        this.$u.toast('地址不能为空');
-				return false;
-			}
-			if(this.$u.test.isEmpty(this.details)) {
-        this.$u.toast('详细地址不能为空');
-				return false;
+      if(this.$u.test.isEmpty(this.idCard)) {
+        this.$u.toast('身份证号不可为空');
+        return false;
       }
+      // if(!this.$u.test.idCard(this.idCard)) {
+      //   this.$u.toast('请正确填写身份证号');
+      //   return false;
+      // }
+			// if(this.$u.test.isEmpty(this.address)) {
+      //   this.$u.toast('地址不能为空');
+			// 	return false;
+			// }
+			// if(this.$u.test.isEmpty(this.details)) {
+      //   this.$u.toast('详细地址不能为空');
+			// 	return false;
+      // }
       if(!this.checkedIndustryList.length) {
         this.$u.toast('行业领域不能为空');
 				return false;
@@ -165,6 +181,7 @@ export default {
       this.$u.api.applyExpert({
         name: this.name, 
         mobile: this.phone, 
+        idcard: this.idCard,
         address: this.address + this.details, 
         industry: this.checkedIndustryList, 
         hobby: this.checkedHobbyList,

pageE/order/Details.vue

@@ -115,7 +115,7 @@ export default {
 					image: '../static/mine/36.png',
 				},
 				'5': {
-					text: '已退款',
+					text: '商家已退款',
 					image: '../static/mine/34.png',
 				},
 				'6': {
@@ -135,7 +135,11 @@ export default {
 					image: '../static/mine/33.png',
 				},
 				'10': {
-					text: '已拒绝',
+					text: '商家已拒绝',
+					image: '../static/mine/34.png',
+				},
+				'11': {
+					text: '平台已退款',
 					image: '../static/mine/34.png',
 				},
 			},
@@ -232,7 +236,7 @@ export default {
 			this.$u.api.getOrderInfo({
 				order_id: id,
 			}).then(res => {
-				// console.log(res)
+				console.log(res)
 				if(res.errCode == 0) {
 					this.orderInfo = res.data;
 					this.setTitle(this.orderInfo.view_type);
@@ -286,6 +290,7 @@ export default {
 		toOtherPage(url) {
 			this.$u.route('/pageE/order/' + url, {
 				oid: this.orderInfo.order_id,
+				type:this.orderInfo.view_type
 			});
 		},
 		makePhone(phone) {
@@ -328,6 +333,9 @@ export default {
 				case 11:
 					state = '10';
 					break;
+				case 12:
+					state = '11';
+					break;
 				default:
 					break;
 			}

pageE/order/RefundOrder.vue

@@ -94,7 +94,8 @@ export default {
 		}
 	},
 	onLoad(option) {
-		this.type = option.type
+		this.type = 2; // 需求更改 所有订单只能全退，不可选择商品。
+		// this.type = option.type
 		this.oid = option.oid;
 		this.getOrderInfo(option.oid);
 	},
@@ -138,17 +139,18 @@ export default {
 		applyRefund() {
 			
 			if(this.type !=2 && !this.verifyParams()) return false;
+			// addrefundall 只需要订单id 和 说明
 			let params = {
 				order_id: this.oid,
-				goods_id: this.goods.goods_id,
-				refund_amount: Number(this.totalPrice),
+				// goods_id: this.goods.goods_id,
+				// refund_amount: Number(this.totalPrice),
 				reason_info: this.refundText,
-				goods_num: this.num,
+				// goods_num: this.num,
 			}
 			console.log(params)
 			if(this.type == 2){
 				this.$u.api.addrefundall(params).then(res => {
-					console.log(JSON.stringify(res))
+					// console.log(JSON.stringify(res))
 					if(res.errCode == 0) {
 						this.$refs.uToast.show({
 							title: res.message,

pageE/setting/Index.vue

@@ -129,8 +129,8 @@
                             plus.cache.clear(function(e) {
                                 console.log(e);
                             })
+                            this.getCache();
                         }
-                        this.getCache();
                     }
                 })
                 // #endif

pageE/tool/MineHistory.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="mine-history">
-		<scroll-view scroll-y class="history-box" @scrolltolower="reachBottom">
+		<view scroll-y class="history-box">
 			<view class="item-box">
 				<!-- 需求：只显示最近五十条数据　后台未作限制 -->
 				<view v-for="(item, index) in historyList" :key="index" class="history-item">
@@ -20,7 +20,7 @@
 			<u-action-sheet :list="actionList" v-model="showAction" :cancel-btn="true" @click="delHistory" border-radius="20"></u-action-sheet>
 			<u-empty text="暂无足迹" mode="list" color="#000" v-if="!historyList.length"></u-empty>
 			<u-loadmore class="load-size" :status="loadStatus" bgColor="#ECECEC" margin-top="20" margin-bottom="20" v-if="historyList.length >= pageSize" @loadmore="reachBottom"></u-loadmore>
-		</scroll-view>
+		</view>
     </view>
 </template>
 
@@ -47,6 +47,9 @@ export default {
     onLoad() {
 		this.getBrowseList();
 	},
+	onReachBottom(){
+		this.reachBottom()
+	},
     methods: {
 		viewAction(id) {
 			this.showAction = true;
@@ -58,6 +61,10 @@ export default {
 			this.$u.api.delMemberBrowse({ goods_id: glist }).then(res => {
 				if(res.errCode == 0) {
 					this.getBrowseList();
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
 				} else {
 					this.$u.toast(res.message);
 				}
@@ -109,13 +116,16 @@ export default {
 	}
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+page{
+	background: #ECECEC;
+}
 .mine-history {
 	min-height: calc(100vh - var(--window-top));
 	background: #ECECEC;
 	.history-box {
 		box-sizing: border-box;
-		height: calc(100vh - var(--window-top));
+		// height: calc(100vh - var(--window-top));
 		padding: 20rpx 30rpx 0;
 		.item-box {
 			display: flex;

pageE/tool/SendWash.vue

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

pages.json

@@ -1211,7 +1211,6 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},

pages/index/index.vue

@@ -273,7 +273,7 @@
 			darenItem
 		},
 		onShow() {
-			console.log(this.imService.status)
+			console.log(this.imService.status,this.$store.state.hasLogin)
 			if(!this.imService.status && this.$store.state.hasLogin){
 				const user = uni.getStorageSync('user_info');
 				// console.log(user)

pages/mine/index.vue

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

pages/shop/index.vue

@@ -351,7 +351,7 @@
 			z-index: 9;
 			position: fixed;
 			right: 30rpx;
-			bottom: 300rpx;
+			bottom: 110rpx;
 			width: 100rpx;
 			height: 100rpx;
 			background: rgba(253, 211, 96, 1);

pages/zhibo/index.nvue

@@ -312,10 +312,11 @@
     width: 690rpx;
 }
 .danmuitem{
-    font-size: 26rpx;
+    font-size: 30rpx;
     color: #fff;
     flex-direction: column-reverse;
     word-wrap:anywhere;
+    font-weight: bold;
 }
 </style>
 
@@ -418,6 +419,7 @@ export default {
         "Authorization" : 'Bearer' + " " + token
       },
       success(res){
+          
         console.log(res)
         that.info = res.data.data
         // that.list= res.data.data
@@ -461,7 +463,11 @@ export default {
       });
     },
     errors(a){
-      console.log(a)
+        this.videoContext.stop();
+        setTimeout(() => {
+            this.videoContext.play()
+        },1000)
+        console.log(a)
     },
     newpeople(list){
       this.room.onlineUsers = list
@@ -497,6 +503,11 @@ export default {
       // 	this.contentPosition = 'message-box'+(this.room.messages.length-1);
               // }, 300)
       console.log(message)
+      if(message.type == 1){
+         
+          console.log('stop')
+          return ;
+      }
               this.danmulist.push(message)
 
               if(this.danmulist.length > 7){