修复了返回播放

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

common/api/user.js

@@ -467,6 +467,18 @@ export default {
 				return vm.$u.post("auth/memberUnbindThird", {
 					third_type: type,
 				})
+			},
+			getIndustryList() {
+				return vm.$u.post("Expertapply/industryList")
+			},
+			getHobbyList() {
+				return vm.$u.post("Expertapply/hobbyList")
+			},
+			// 达人申请
+			applyExpert({ name, mobile, address, industry, hobby }) {
+				return vm.$u.post("Expertapply/expertApply", {
+					name, mobile, address, industry, hobby
+				})
 			}
 		}
 		

components/informations/notice/notice.vue

@@ -4,7 +4,9 @@
 			<view class="time_notice">{{ item.addtime }}</view>
 			<view class="notice_view">
 				<image :src="item.picture" mode="aspectFill" ></image>
-				<view class="text_view u-line-2">{{ item.content }}</view>
+				<view class="text_view">
+                    <view class="u-line-2">{{ item.content }}</view>
+                </view>
 				<view class="notice_list">
 					<text>查看详情</text>
 					<u-icon name="arrow-right" color="#666"></u-icon>
@@ -28,21 +30,17 @@
 			border-radius: 20rpx 20rpx 0px 0px;
 		}
 		.text_view{
-			font-size:26rpx;
+            width: 690rpx;
-			font-weight:400;
+            height: 120rpx;
-			color:rgba(51,51,51,1);
+			padding: 26rpx;
-			margin: 28rpx 0 30rpx 0;
+            color: #333;
-			width: 643rpx;
+            font-size: 26rpx;
-			margin: 0 auto;
+            line-height: 38rpx;
-			text-align: left;
-			line-height: 40rpx;
-			letter-spacing: 2rpx;
 		}
 		.notice_view > view:nth-child(3){
-			height: 84rpx;
+			height: 80rpx;
-			line-height: 84rpx;
+			line-height: 80rpx;
 			border-top: 1px #F5F5F5  solid;
-			margin-top: 30rpx;
 		}
 	}
 	.time_notice{
@@ -53,22 +51,11 @@
 		padding: 26rpx 0 39rpx 0;
 	}
 	.notice_list{
-		text-align: left;
+        display: flex;
-		display: inline-block;
+        align-items: center;
+        justify-content: space-between;
 		width: 100%;
-		position: relative;
 		padding: 0 25rpx;
-		margin: 0 auto;
-		display: block;
-	}
-	.notice_list > view{
-		text-align: right;
-		position: absolute;
-		right: 25rpx;
-		top: 0;
-		bottom: 0;
-		margin: auto;
-		
 	}
 	
 </style>

pageC/cart/ConfirmOrder.vue

@@ -392,8 +392,10 @@ export default {
 		async setDelivery(index) {
 			// console.log(index);
 			if(index == 1) {
-				if(!this.isTakeawayer) this.$u.toast('此地区不支持骑手配送');
+				if(!this.isTakeawayer) {
-				return false;
+					this.$u.toast('此地区不支持骑手配送');
+					return false;
+				}
 				this.delivery = this.deliveryList[index];
 				this.getFreight();
 			} 
@@ -404,7 +406,6 @@ export default {
 						this.freight[key] = '0.00';
 					}
 				}
-				this.isTakeawayer = false;
 				this.setTotalPrice(); // 计算总价
 				this.delivery = this.deliveryList[index];
 			} else {

pageD/logistics/logistics.vue

@@ -4,9 +4,13 @@
 		<view class="activity" v-for="(item, index) in actives" :key="index">
 			<view class="times">{{item.kd_time}}</view>
 			<view class="content">
-				<view class="store_name">
+				<view class="store-name">
 					<image :src="item.store_avatar"></image>
-					<view>{{item.store_name}}</view>
+					<view class="name">{{item.store_name}}</view>
+					<view class="takeawayer" v-if="item.takeawayer_phone" @click="makePhone(item.takeawayer_phone)">
+						<u-icon name="phone-fill" color="#FF780F" size="28"></u-icon>
+						<text>联系骑手</text>
+					</view>
 				</view>
 				<view class="xiantiao"></view>
 				<view class="title">{{item.title}}</view>
@@ -77,10 +81,13 @@
 				this.$u.route(url, {
 					oid: item.order_id,
 				});
+			},
+			makePhone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
 			}
 		},
-		components:{
-		}
 	};
 </script>
 
@@ -147,25 +154,31 @@ page{
 			margin-bottom: 20rpx;
 		}
 		// 店铺
-		.store_name{
+		.store-name{
 			overflow: hidden;
 			zoom: 1;
 			padding: 0rpx 0 20rpx 0;
+			display: flex;
+			align-items: center;
 			image{
 				width: 60rpx;
 				height: 60rpx;
 				border-radius: 50%;
 				float: left;
 			}
-			view{
+			.name {
 				font-size:26rpx;
 				color:rgba(51,51,51,1);
-				float: left;
-				display: table-cell;
 				line-height: 60rpx;
 				display: inline-block;
 				margin-left: 21rpx;
 			}
+			.takeawayer {
+				margin-left: auto;
+				> text {
+					margin-left: 10rpx;
+				}
+			}
 		}
 	}
 }

pageE/mine/Integral.vue

@@ -124,6 +124,7 @@ export default {
 			align-items: center;
 			justify-content: center;
 			margin-bottom: 52rpx;
+			// font-weight: bold;
 			> image {
 				width: 22rpx;
 				height: 22rpx;

pageE/mine/MemberServe.vue

@@ -9,11 +9,11 @@
 					<view class="integral-top">
 						<view>
 							<view class="title">总积分</view>
-							<view class="value">{{ memberInfo.member_points }}</view>
+							<view class="value">{{ memberInfo.member_points || 0 }}</view>
 						</view>
 						<view>
 							<view class="title">经验值</view>
-							<view class="value">{{ memberInfo.member_exppoints }}</view>
+							<view class="value">{{ memberInfo.member_exppoints || 0 }}</view>
 						</view>
 						<view @click="viewProgress">
 							<view class="title">预计进度</view>
@@ -24,7 +24,14 @@
 						</view>
 					</view>
 					<scroll-view scroll-y class="integral-botom" :style="{ height: richHeight }">
-						<rich-text :nodes="nodes"></rich-text>
+						<view class="rich-container">
+							<view class="title">{{ points_rule.document_title }}</view>
+							<rich-text :nodes="pointsNodes"></rich-text>
+						</view>
+						<view class="rich-container">
+							<view class="title" >{{ member_rule.document_title }}</view>
+							<rich-text :nodes="nodes"></rich-text>
+						</view>
 					</scroll-view>
 				</view>
 			</swiper-item>
@@ -69,7 +76,10 @@ export default {
 			swiperCurrent: 0,
 			pointslogList:  [],
 			memberInfo: {},
+			pointsNodes: '',
 			nodes: '',
+			points_rule: {},
+			member_rule: {}
 		}
 	},
 	components: {
@@ -103,7 +113,10 @@ export default {
 			this.$u.api.getMemberPointsStat().then((res)=>{
 				if(res.errCode == 0) {
 					this.memberInfo = res.data;
-					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
+					this.nodes = common.unescapeHTML(this.memberInfo.grade_rule.document_content);
+					this.pointsNodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
+					this.points_rule = this.memberInfo.points_rule;
+					this.member_rule = this.memberInfo.grade_rule;
 				}
 			})
 		},
@@ -180,6 +193,18 @@ export default {
 				border-radius: 20rpx 20rpx 0rpx 0rpx;
 				top: 250rpx;
 				z-index: 9;
+				.rich-container {
+					&:not(:last-child) {
+						margin-bottom: 56rpx;
+					}
+					.title {
+						text-align: center;
+						font-size: 32rpx;
+						color: #333333;
+						margin-bottom: 26rpx;
+						// font-weight: bold;
+					}
+				}
 			}
 		}
 		.coupon {

pageE/more/ApplyLive.vue

@@ -0,0 +1,254 @@
+<template>
+  <view class="apply-live">
+    <view class="basic-info">
+      <view>
+        <label for="name">姓名:</label>
+        <input type="text" id="name" v-model="name" placeholder="请输入姓名" />
+      </view>
+      <view>
+        <label for="phone">手机号:</label>
+        <input type="number" id="phone" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+      </view>
+      <view @click="show=true">
+        <label for="address">居住地址:</label>
+        <input type="text" id="address" v-model="address" disabled placeholder="请选择居住地址" />
+        <u-icon name="arrow-down" color="#343434" size="26" class="arrow-icon"></u-icon>
+      </view>
+      <view>
+        <label for="details">详细地址:</label>
+        <input type="text" id="details" v-model="details" placeholder="请填写详细地址" />
+      </view>
+    </view>
+    <view class="other-info">
+      <view class="item-box specialty">
+        <view class="title">特长领域：<text class="brief">(多选）</text></view>
+        <view class="check-box-container">
+          <u-checkbox-group @change="specialtyGroupChange" active-color="#fff">
+            <u-checkbox 
+              v-model="item.checked" 
+              v-for="(item, index) in industryList" :key="index" 
+              :name="item.name"
+            >{{item.name}}</u-checkbox>
+          </u-checkbox-group>
+        </view>
+      </view>
+      <view class="item-box hobby">
+        <view class="title">兴趣爱好：<text class="brief">(多选）</text></view>
+        <view class="check-box-container">
+          <u-checkbox-group @change="hobbyGroupChange" active-color="#fff">
+            <u-checkbox 
+              v-model="item.checked" 
+              v-for="(item, index) in hobbyList" :key="index" 
+              :name="item.name"
+            >{{item.name}}</u-checkbox>
+          </u-checkbox-group>
+        </view>
+      </view>
+    </view>
+    <view class="submit-btn" @click="applyExpert">提交申请</view>
+    <u-select v-model="show" 
+				mode="mutil-column-auto" 
+				:list="areaList" 
+				value-name="area_id" 
+				label-name="area_name" 
+				child-name="_child" 
+				@confirm="setArea">
+		</u-select>
+    <u-toast ref="uToast" />
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      show: false,
+      areaList: [],
+      name: '',
+      phone: '',
+      address: '',
+      details: '',
+      industryList: [],
+      hobbyList: [],
+      checkedIndustryList: [],
+      checkedHobbyList: [],
+      isSubmit: true, // 防止多次提交
+    }
+  },
+  onLoad() {
+    this.getAreaData();
+    this.getIndustryList();
+    this.getHobbyList();
+  },
+  methods: {
+    getAreaData() {
+			this.$u.api.getArea().then((res)=>{
+				if (res.errCode == 0) {
+					this.areaList = res.data;
+				}
+			})
+		},
+    getIndustryList() {
+      this.$u.api.getIndustryList().then(res => {
+        res.data.forEach(element => {
+          this.industryList.push({
+            checked: false,
+            name: element,
+          });
+        });
+      })
+    },
+    getHobbyList() {
+      this.$u.api.getHobbyList().then(res => {
+        res.data.forEach(element => {
+          this.hobbyList.push({
+            checked: false,
+            name: element,
+          });
+        });
+      })
+    },
+    specialtyGroupChange(e) {
+      // console.log(e);
+      this.checkedIndustryList = e;
+    },
+    hobbyGroupChange(e) {
+      // console.log(e);
+      this.checkedHobbyList = e;
+    },
+    // 验证
+		validateData() {
+			if(this.$u.test.isEmpty(this.name)) {
+        this.$u.toast('姓名不能为空');
+				return false;
+			}
+			if(this.$u.test.isEmpty(this.phone)) {
+        this.$u.toast('手机号不能为空');
+				return false;
+			}
+			if(!this.$u.test.mobile(this.phone)) {
+        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;
+      }
+      if(!this.checkedHobbyList.length) {
+        this.$u.toast('兴趣爱好不能为空');
+				return false;
+			}
+			return true;
+		},
+    applyExpert() {
+      if(!this.isSubmit) return false;
+      if(!this.validateData()) return false;
+      this.isSubmit = false;
+      this.$u.api.applyExpert({
+        name: this.name, 
+        mobile: this.phone, 
+        address: this.address + this.details, 
+        industry: this.checkedIndustryList, 
+        hobby: this.checkedHobbyList,
+      }).then(res => {
+        if(res.errCode == 0) {
+          this.$refs.uToast.show({
+            title: res.message,
+            back: true,
+          })
+        } else {
+          this.isSubmit = true;
+          this.$u.toast(res.message);
+        }
+      })
+    },
+    setArea(area) {
+			// console.log(area);
+			this.area_id = area[0].value;
+			this.city_id = area[1].value;
+			let temp = '';
+			area.forEach(e => {
+				temp += e.label;
+			});
+			this.address = temp;
+		},
+  }
+};
+</script>
+<style lang="scss" scoped>
+.apply-live {
+  min-height: calc(100vh - var(--window-top));
+  background-color: #ECECEC;
+  padding-bottom: 60rpx;
+  .basic-info {
+    > view {
+      background-color: #FFFFFF;
+      padding: 34rpx 30rpx;
+      display: flex;
+      align-items: center;
+      margin-bottom: 2rpx;
+      > label {
+        width: 134rpx;
+        margin-right: 56rpx;
+        font-size: 30rpx;
+        color: #343434;
+      }
+      > input {
+        flex: 1;
+        font-size: 28rpx;
+      }
+      .arrow-icon {
+        margin-left: 20rpx;
+      }
+    }
+  }
+  .other-info {
+    margin-bottom: 80rpx;
+    .item-box {
+      background-color: #FFFFFF;
+      padding: 35rpx 30rpx;
+      margin-bottom: 1rpx;
+      .title {
+        font-size: 30rpx;
+        color: #343434;
+        margin-bottom: 30rpx;
+        .brief {
+          color: #9A9A9A;
+        }
+      }
+      .check-box-container {
+        /deep/ .u-checkbox {
+          margin-bottom: 24rpx;
+          .u-checkbox__icon-wrap {
+            border-color: #C0C0C0 !important;
+          }
+          .u-checkbox__icon-wrap--checked {
+            .u-icon__icon {
+              color: #FF780F !important;
+            }
+          }
+        }
+      }
+    }
+  }
+  .submit-btn {
+    width: 690rpx;
+    height: 98rpx;
+    background: #FF7810;
+    border-radius: 49rpx;
+    font-size: 36rpx;
+    color: #FFFFFF;
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>

pages.json

@@ -136,9 +136,9 @@
 								"buttons": [
 									{
 										"type":"none",
-										"text":"\ue503",
+										"text":"\ue001",
 										"float":"right",
-										"fontSize":"20",
+										"fontSize":"18",
 										"fontSrc": "/static/fonts/cart.ttf"
 									}
 								]
@@ -167,9 +167,9 @@
 								"buttons": [
 									{
 										"type":"none",
-										"text":"\ue503",
+										"text":"\ue001",
 										"float":"right",
-										"fontSize":"20",
+										"fontSize":"18",
 										"fontSrc": "/static/fonts/cart.ttf"
 									}
 								]
@@ -378,9 +378,9 @@
 									// },
 									{
 										"type":"none",
-										"text":"\ue503",
+										"text":"\ue001",
 										"float":"right",
-										"fontSize":"22",
+										"fontSize":"18",
 										"fontSrc": "/static/fonts/cart.ttf",
 										"color": "#FFFFFF"
                                         
@@ -622,6 +622,19 @@
 						}
 					}
 				},
+				{
+					"path": "more/ApplyLive",
+					"style": {
+						"navigationBarTitleText": "达人申请",
+						"app-plus": {
+							"titleSize": "36px",
+							"titleNView": {
+								"titleColor": "#333333",
+								"backgroundColor": "#FFFFFF"
+							}
+						}
+					}
+				},
 				{
 					"path": "mine/ArticleDetails",
 					"style": {

pages/mine/index.vue

@@ -103,9 +103,12 @@
 					<view class="badge-box" @click="toOtherPage('/more/Complaints')">
 						<image src="/static/image/mine/15.png"></image>
 						<view>投诉意见</view>
-                        <u-badge size="mini" :count="userInfo.feedback_show" :offset="offset" type="error"></u-badge>
+            <u-badge size="mini" :count="userInfo.feedback_show" :offset="offset" type="error"></u-badge>
+					</view>
+					<view @click="toOtherPage('/more/ApplyLive')">
+						<image src="/static/image/mine/45.png"></image>
+						<view>达人申请</view>
 					</view>
-					<!-- <view></view> -->
 				</view>
 			</view>
 		</view>
@@ -118,8 +121,8 @@ export default {
 	computed: {
 		...mapState(['hasLogin', 'token'])
 	},
-    data() {
+  data() {
-        return {
+		return {
 			userInfo: {},
 			orderList: [
 				{
@@ -165,8 +168,8 @@ export default {
 					number: '',
 				},
 			],
-            offset: [-10,6]
+			offset: [-10,6]
-        };
+		};
 	},
 	filters: {
 		phoneFormat(value) {
@@ -180,9 +183,9 @@ export default {
 				url: "../../pageA/login/login"
 			})
 		} else {
-            this.getOrderNumber();
+      this.getOrderNumber();
 			this.getUserInfo();
-        }
+    }
 	},
 	onNavigationBarButtonTap(e) {
 		// console.log(e);
@@ -300,12 +303,12 @@ export default {
 		.bottom {
 			display: flex;
 			justify-content: space-around;
-            padding: 0 10rpx;
+      padding: 0 10rpx;
 			box-sizing: border-box;
 			> view {
 				text-align: center;
 				font-size: 26rpx;
-                font-weight: 500;
+        font-weight: 500;
 				color: #333;
 				> view:first-child {
 					margin-bottom: 10rpx;
@@ -330,15 +333,15 @@ export default {
 				display: flex;
 				align-items: center;
 				height: 76rpx;
-                padding: 0 20rpx;
+        padding: 0 20rpx;
 				font-size: 28rpx;
 				color: #666;
-                border-bottom: 1px solid #ececec;
+        border-bottom: 1px solid #ececec;
+			}
+			.title-text-more {	
+			  font-size: 24rpx;
+			  color: #999;
 			}
-            .title-text-more {	
-                font-size: 24rpx;
-                color: #999;
-            }
 			.content {
 				padding: $content-padding-top $content-padding-row $content-padding-bottom;
 				display: flex;
@@ -379,7 +382,7 @@ export default {
 				}
 			}
 			.content {
-                align-items: center;
+        align-items: center;
 				justify-content: space-between;
 				> view {
 					display: flex;
@@ -448,11 +451,11 @@ export default {
 					width: 100rpx;
 				}
 				> view:not(:last-child) {
-					margin-right: 36rpx;
+					margin-right: 32rpx;
 				}
 			}
 		}
-		 .more-tool {
+		.more-tool {
 			@include common-mine(
 				$content-padding-top: 24rpx, 
 				$content-padding-row: 20rpx,
@@ -465,12 +468,12 @@ export default {
 					width: 100rpx;
 				}
 				> view:not(:last-child) {
-					margin-right: 36rpx;
+					margin-right: 32rpx;
 				}
 			}
-            .badge-box {
+			.badge-box {
-                position: relative;
+				position: relative;
-            }
+			}
 		}
 	}
 }

pages/zhibo/index.nvue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors">
+    <video :src="url" class="vodio" :autoplay="true" id="myVideo" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors">
 
     </video>
     <view class="user" :style="{'top': top}">
@@ -337,7 +337,8 @@ export default {
       danmu:false,
       room:{},
       chatRoomService:{},
-      danmulist:[]
+      danmulist:[],
+      videoContext:{}
     };
   },
   onBackPress(options) {  
@@ -347,14 +348,10 @@ export default {
       return false;  
   },
   onShow(){
-    if(this.url != '' && this.url){
+    this.videoContext.play()
-      let url = this.url
-      this.url = ""
-      this.url = url
-    }
   },
   onLoad(a) {
-  
+    this.videoContext = uni.createVideoContext('myVideo')
     this.url = a.url;
     this.id = a.id
     console.log(this.url);