diff --git a/app.json b/app.json
index e2d5679..41af70f 100644
--- a/app.json
+++ b/app.json
@@ -1,5 +1,6 @@
{
"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": "获取你的位置信息"
diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js
index 289e298..4c67c3f 100644
--- a/components/diy_seckill/diy_seckill.js
+++ b/components/diy_seckill/diy_seckill.js
@@ -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) {
diff --git a/pages/order/refund_order/refund_order.js b/pages/order/refund_order/refund_order.js
index 4533643..49b0e8e 100644
--- a/pages/order/refund_order/refund_order.js
+++ b/pages/order/refund_order/refund_order.js
@@ -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',{
diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js
index 8a6b8b2..498853c 100644
--- a/pages/team/team_show/team_show.js
+++ b/pages/team/team_show/team_show.js
@@ -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,
});
}
}
diff --git a/pages/user/return_goods/return_goods.js b/pages/user/return_goods/return_goods.js
index 2397960..a941c79 100644
--- a/pages/user/return_goods/return_goods.js
+++ b/pages/user/return_goods/return_goods.js
@@ -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() {
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index fef23f5..01be957 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -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
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 5c64773..66d1311 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -116,7 +116,10 @@
出生日期
-
+
+
+
+
@@ -124,20 +127,25 @@
+
+
+
+
农历
-
+
+ {{datet?datet:"请选择时间"}}
{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}
-
+
diff --git a/pages/video/index.js b/pages/video/index.js
new file mode 100644
index 0000000..82614ac
--- /dev/null
+++ b/pages/video/index.js
@@ -0,0 +1,60 @@
+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
diff --git a/pages/video/index.json b/pages/video/index.json
new file mode 100644
index 0000000..6cb999b
--- /dev/null
+++ b/pages/video/index.json
@@ -0,0 +1,8 @@
+{
+ "navigationBarTitleText": "直播视频回放",
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "goods_recommend":"/components/goods_list/goods_list",
+ "nav_box": "/components/nav_box/nav_box"
+ }
+}
\ No newline at end of file
diff --git a/pages/video/index.wxml b/pages/video/index.wxml
new file mode 100644
index 0000000..9f7e86c
--- /dev/null
+++ b/pages/video/index.wxml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 好物推荐
+
+
+
+
+
+
+
+
+
+
+
+ GOOD HOT THING
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/video/index.wxss b/pages/video/index.wxss
new file mode 100644
index 0000000..04a0b0d
--- /dev/null
+++ b/pages/video/index.wxss
@@ -0,0 +1,49 @@
+.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