Merge branch 'test' into 'qa'

Test See merge request !330

Merge branch 'test' into 'qa'
Test See merge request !330
后端研发-苏明海
2 parents 4b835517 c3170cbf
Showing 11 changed files with 211 additions and 31 deletions
app.json
components/diy_seckill/diy_seckill.js
pages/order/refund_order/refund_order.js
pages/team/team_show/team_show.js
pages/user/return_goods/return_goods.js
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
pages/video/index.js
pages/video/index.json
pages/video/index.wxml
pages/video/index.wxss
 {
   "pages": [
+   
     "pages/index/index/index",    
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
@@ -81,21 +82,10 @@
     "pages/user/assistance/task_assistance",
     "pages/user/assistance/friend_assistance",
     "pages/user/assistance/assistance_success",
-    "pages/user/assistance/assistance"
+    "pages/user/assistance/assistance",
+    "pages/video/index"    
  
-  ],
-    "subPackages": [
-      {
-        "root": "packageA/",
-        "pages": [],
-        "plugins": {
-          "live-player-plugin": {
-            "version": "1.0.2",
-            "provider": "wx2b03c6e691cd7370"
-          }
-        }
-      }
-    ],
+  ],   
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
@@ -62,8 +62,7 @@ Component({
       app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
         +os.stoid+"&goodsidlist="+goodsidlist, {}).then(res => {
         //如果秒杀的数组为空的时候
-        console.log(111111111111)
-          console.log(res.data.data)
+      
         var goodslist=res.data.data;
         if(goodslist.length==0) return false;
  
@@ -128,7 +127,7 @@ Component({
         for (var i = 0; i < endTimeList.length; i++) {
           var o = endTimeList[i];
           var endTime = o.end_time;
-          //  if (o.status == 0) endTime = o.start_time;
+          if (newTime< o.start_time) endTime = o.start_time;
           let obj = null;
           // 如果活动未结束，对时间进行处理
           if (endTime - newTime > 0) {
@@ -14,6 +14,7 @@ Page({
         reasonSelect: 0,
         reasonList: [ "订单不能按预计时间送达", "操作有误(商品、地址等选错)", "重复下单/误下单", "其他渠道价格更低", "该商品降价了", "不想买了", "其他原因" ],
         refund_type:0,
+		isloading:0,
     },
     onLoad: function(t) {
        var th=this;
@@ -48,6 +49,8 @@ Page({
  
     //------提交退款申请-------
     refundOrder: function(e) {
+	   if(this.data.isloading) return false;
+	   this.data.isloading=1;   		
        var th = this;
        //----获取订单的所有商品-----
        rq.get('/api/weshop/ordergoods/list',{
@@ -132,12 +132,22 @@ Page({
  
   },
   //qh点击取货
-  cqh: function(e) {
-    this.setData({
-      qh: false,
-      xz: true,
-      one: true,
-    })
+  cqh: function(e) {	  
+	if(this.data.ssl)  {		
+		this.setData({
+		  qh: false,
+		  xz: true,
+		  one: true,
+		})
+	}else{
+		this.setData({
+		  qh: false,
+		  xz: true,
+		  one: false,
+		  list:1,
+		})
+	}
+	
   },
  
   //cxz点击选择门店
@@ -671,14 +681,14 @@ Page({
                   //--只留第二层---
                   th.setData({
                     is_show_sto_cat: 0,
-                    ssl_child: e.data.data.pageData
+                    ssl_child: e.data.data.pageData,					
                   });
                 }
               } else {
                 //--只留第二层---
                 th.setData({
                   is_show_sto_cat: 0,
-                  ssl_child: e.data.data.pageData
+                  ssl_child: e.data.data.pageData,				 				  
                 });
               }
             }
@@ -23,6 +23,7 @@ Page({
         popState: !0,
         description: "",
         refund_type:0,
+		isloading:0,
     },
     onLoad: function(e) {
         var a = this;
@@ -124,8 +125,11 @@ Page({
         });
     },
  
+    
     /*-------------提交退款申请--------------*/
     submiApply: function() {
+		if(this.data.isloading) return false;
+		this.data.isloading=1;		
         var t = this,th=t;
         this.checkSubmit(function() {
             t.uploadPhotos(function() {
@@ -51,7 +51,7 @@ Page({
     ispwhid: 1, //是否隐藏密码显示
     isstcsp: 0, //是否启动密码消费
     isGender: 1, //什么性别
-    iscalendar: 1, //是否是农历
+    iscalendar: 0, //是否是农历
     consumption: "", //消费密码
     identity_card: "", //身份证值
     address: "", //地址
@@ -127,6 +127,8 @@ Page({
   },
   //出生日期是否是农历
   iscalendar: function() {
+	   
+	if(this.data.user.birthday)  return false;	  
     var th = this;
     var iscalendar = th.data.iscalendar;
     if (iscalendar == 0) {
@@ -628,8 +630,8 @@ Page({
  
 		if(!a) a={};	
         var time ="",birthday =""; 
-		 if(a && a.reg_time) util.formatTime(a.reg_time, "'Y/M/D");       
-		 if(a && a.birthday) util.formatTime(a.birthday, "'Y/M/D");
+		 if(a && a.reg_time) time=util.formatTime(a.reg_time, "'Y/M/D");       
+		 if(a && a.birthday) birthday=util.formatTime(a.birthday, "'Y/M/D");
  
         a.reg_time = time;
         a.birthday = birthday
@@ -116,7 +116,10 @@
         <view>出生日期</view>
         <view class="flex flex-vertical-between fs28 Birth">
           <view class="flex" bindtap="iscalendar">
-            <block wx:if="{{iscalendar&&user.birthday==null&&user.birthday==''}}">
+			  
+			  <block wx:if="user.birthday==null&&user.birthday==''">
+			  
+            <block wx:if="{{iscalendar}}">
               <view class="flex-center">
                 <icon size="20" type="success" color="rgb(212,2,31)"></icon>
               </view>
@@ -124,20 +127,25 @@
             <block wx:else>
               <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon>
             </block>
+			
+			</block>
+			
+			
             <view class="flex-center">
               <view class="Mleft">农历</view>
             </view>
           </view>
           <view class="user-txt-right">
             <!-- 填充数据的时候要判断是否已经有出生日期，有值的话就不可修改 -->
-            <block wx:if="{{user.birthday==''||user.birthday==null}}">
+            <block wx:if="{{user.birthday==''||user.birthday==null}}">				
               <picker bindchange='bindChange' value="{{datet}}" mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
+				  {{datet?datet:"请选择时间"}}
               </picker>
             </block>
             <block wx:else>
               <view>{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}</view>
             </block>
-
+			
           </view>
         </view>
       </view>
+Page({
+  onReady: function (res) {
+  
+  },  
+  bindInputBlur: function(e) {
+    this.inputValue = e.detail.value
+  },
+  bindButtonTap: function() {
+    var that = this
+    wx.chooseVideo({
+      sourceType: ['album', 'camera'],
+      maxDuration: 60,
+      camera: ['front','back'],
+      success: function(res) {
+        that.setData({
+          src: res.tempFilePath
+        })
+      }
+    })
+  },
+  bindSendDanmu: function () {
+    this.videoContext.sendDanmu({
+      text: this.inputValue,
+      color: getRandomColor()
+    })
+  },
+  onShow:function(){
+	  var goods_list = this.selectComponent("#goods_list"); //组件的id
+	  goods_list.init();
+	  setTimeout(function() {
+	    goods_list.get_list();
+	  }, 300)
+  },
+  
+    //---------分享配置--------
+    onShareAppMessage: function (e) {
+      return {
+        title: "直播视频回放",
+      }
+    },
+  //调用视频接口
+  onLoad:function(e){
+	  var r_id=e.id,th=this;	  
+	  if(!r_id) r_id=1;
+	  getApp().request.get("/api/wx/weappLiveReplaylist/get?id="+r_id,{
+		  data:{stoid:getApp().globalData.setting.stoid},
+		  success:function(res){
+			   if(res.data.code==0){
+				   th.setData({src:res.data.data.media_url})
+			   }
+		  }
+	  })	  
+  },
+  //---加载更多是靠这个函数----
+  onReachBottom: function() {
+    var goods_list = this.selectComponent("#goods_list"); //组件的id
+    if (goods_list) goods_list.get_list();
+  },
+  
+})
 \ No newline at end of file
+{
+    "navigationBarTitleText": "直播视频回放",
+    "enablePullDownRefresh": false,
+	"usingComponents": {
+		 "goods_recommend":"/components/goods_list/goods_list",
+		 "nav_box": "/components/nav_box/nav_box"
+	}
+}
 \ No newline at end of file
+
+<view class="video">
+  <video
+   src="{{src}}"
+   controls
+   show-fullscreen-btn
+   show-mute-btn
+   bindplay = "play"
+   bindwaiting="waiting"
+   binderror="error"
+   bindpause="pause"
+   bindtimeupdate="timeupdate"></video>
+</view>
+
+
+ <!-- 标题 -->
+    <view  class="title">
+      <!-- 中文名标题 -->
+      <view class="China flex-level">
+        <view class="line flex-vertical">
+          <view class="one"></view>
+          <view class="two"></view>
+          <view class="three"></view>
+        </view>
+
+        <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
+
+        <view class="line flex-vertical">
+          <view class="three"></view>
+          <view class="two"></view>
+          <view class="one"></view>
+        </view>
+      </view>
+
+      <!-- 英文标题 -->
+      <view class="english flex-center">
+        <view class="silk"></view>
+        <view class="esh five-level-word">GOOD HOT THING</view>
+        <view class="silk"></view>
+      </view>
+
+    </view>
+
+<!-- 商品列表组件 -->
+<goods_recommend id="goods_list"></goods_recommend>
+<!--  制作一个圆球导航  -->
+<nav_box></nav_box>
 \ No newline at end of file
+.page-body-button {
+  margin-bottom: 30rpx;
+}
+
+video {
+  width: 100%;
+}
+
+/* 热门好物 */
+
+.title .China {
+  width: 100%;
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  line-height: 0rpx;
+}
+
+.title .China .line view {
+  width: 2rpx;
+}
+
+.title .China .line {
+  height: 40rpx;
+  color: rgb(51, 51, 51);
+}
+
+.title .China .line view {
+  border-left: 3rpx solid #000;
+  margin-left: 5rpx;
+}
+
+.title .China .line .one {
+  height: 23rpx;
+}
+
+.title .China .line .two {
+  height: 15rpx;
+}
+
+.title .China .line .three {
+  height: 18rpx;
+}
+
+.title .China .Recommend {
+  margin: 0rpx 20rpx;
+  font-size: 28rpx;
+  line-height: 39rpx;
+  font-weight: bold;
+}
 \ No newline at end of file