Merge branch 'master' into dev_techan

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest112? true : false;
+            data.isTest = data.isTest113? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/ask/index.wxml

@@ -21,6 +21,6 @@
 </navigator>
 <view class="fixed-bottom-blank"></view>
 <view class="fixed-bottom">
-  <input type="text" bindinput="inputQues" placeholder="请输入5-50字的问题"></input>
+  <input value="{{ques}}" type="text" bindinput="inputQues" placeholder="请输入5-50字的问题"></input>
   <view class="btn" bindtap="question">提问</view>
 </view>

pages/ask/my/index.wxml

@@ -23,4 +23,8 @@
       <!-- <view class="ans-number">全部{{item.answers.total}}个回答 <text class="iconfont icon-you"></text> </view> -->
     </view>
   </navigator>
+</view>
+
+<view style="text-align: center;padding-top: 40rpx;" wx:if="{{list.length<=0}}">
+    暂无数据
 </view>

pages/info/roadInfo/index.js

@@ -23,7 +23,11 @@ Page({
         showShareFlag: false,
         showQrCode: false,
         wxqrcode: null,
-        ZTPoint:''
+        ZTPoint:'',
+
+        skuIndex: 0,
+        skuFlag: false,
+        producNum: 1,
     },
 
     /**
@@ -159,6 +163,15 @@ Page({
 
     },
     order: function () {
+        // todo 判断组合产品
+        // if (this.data.info.is_compose == 1) {
+        // if (true) {
+        //     // 打开规格弹窗
+        //     this.setData({skuFlag: true})
+        //     return
+        // }
+
+
         commonApi.user_post('wx/get_user_keep', {
             jumpurl: '/pages/info/roadInfo/index?id=' + this.data.id,
             title: this.data.info.title,
@@ -196,6 +209,21 @@ Page({
 
 
     },
+
+    // 组合产品获取购买的sku
+    getComposeSku () {
+        commonApi.user_post("product/get_sku_compose_list", {
+            sku_id: "190720"
+        }).then(res => {
+            if (res&&Array.isArray(res.data)&&res.data.length>0) {
+                res.data.forEach(v => {
+                    v.sku.is_compose = 1
+                });
+                util.orderByShoppingCart(res.data,app)
+            }
+        })
+    },
+
     pagePoint: function (e) {
         util.pagePoint(e)
     },
@@ -467,6 +495,27 @@ Page({
         }
     },
 
+
+    setSimpleValue: function (e) {
+        let keyname = e.currentTarget.dataset.keyname
+        let val = e.currentTarget.dataset.val
+        let param = {}
+        param[keyname] = val
+        this.setData(param)
+    },
+    minus: function () {
+        if (this.data.producNum == 1) return;
+        this.setData({
+            producNum: this.data.producNum - 1
+        })
+    },
+    add: function () {
+        this.setData({
+            producNum: this.data.producNum + 1
+        })
+    },
+
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/info/roadInfo/index.wxml

@@ -120,4 +120,38 @@
   </view>
 </view>
 <code showModel="{{showQrCode}}" qrcode = "{{wxqrcode}}">
-</code>
+</code>
+
+
+<view class="mask" wx:if="{{skuFlag}}">
+  <view class="mask-bg" bindtap="setSimpleValue" data-keyname="skuFlag" data-value="{{false}}"></view>
+  <view class="mask-content">
+    <view class="iconfont icon-close" bindtap="setSimpleValue" data-keyname="skuFlag" data-value="{{false}}"></view>
+    <view class="sku-info-box">
+      <image id="skuImg" src="{{info.sku[skuIndex].headimg}}" mode="aspectFill"></image>
+      <view class="sku-info">
+        <view class="sku-price">{{info.sku[skuIndex].price/100}}
+          <!-- <view class="allowance" wx:if="{{allowance_data}}">
+            补贴价：￥{{ (1 - allowance_data.discount_rate / 100) * info.sku[skuIndex].price / 100 }}</view> -->
+        </view>
+        <view class="sku-name">已选择：{{info.sku[skuIndex].sku_name}}</view>
+      </view>
+    </view>
+    <view class="sku-names">
+      <view bindtap="setSimpleValue" data-keyname="skuIndex" data-value="{{index}}"
+      class="sku-name-item textOver{{index==skuIndex?' active':''}}" 
+      wx:for="{{info.sku}}">{{item.sku_name}}</view>
+    </view>
+    <view class="number-box">
+      <text>数量</text>
+      <view class="iconfont icon-sami-select" bindtap="minus"></view>
+      <view class="number">{{producNum}}</view>
+      <view class="iconfont icon-add-select" bindtap="add"></view>
+    </view>
+    <view style="height:138rpx"></view>
+    <view class="btn-box">
+      <view class="mask-btn" bindtap="getComposeSku" wx:if="{{info.sku[skuIndex].flag=='on'}}">立即购买</view>
+      <view class="mask-btn disable" wx:else>该商品已下架</view>
+    </view>
+  </view>
+</view>

pages/info/roadInfo/index.wxss

@@ -441,4 +441,154 @@ page {
   font-size: 31rpx;
   font-weight: 500;
   margin-top: 50rpx;
-}
+}
+
+
+
+
+.sku-info-box {
+    margin: 50rpx 40rpx;
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .sku-info-box image {
+    width: 218rpx;
+    height: 180rpx;
+    border-radius: 13rpx;
+    display: block;
+    margin-right: 40rpx;
+    flex-shrink: 0;
+  }
+  
+  .sku-info {
+    flex: 1;
+  }
+  
+  .sku-price {
+    font-size: 40rpx;
+    font-weight: 500;
+    color: #D62828;
+    margin: 20rpx 0;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  
+  .sku-price::before {
+    content: "￥";
+    font-weight: 400;
+    font-size: 27rpx;
+    vertical-align: baseline;
+  }
+  
+  .sku-price view {
+    font-size: 24rpx;
+    color: #FFFFFF;
+    background-color: #D62828;
+    border-radius: 22rpx;
+    line-height: 44rpx;
+    margin-left: 7rpx;
+    padding: 0 20rpx;
+  }
+  
+  .sku-name {
+    font-size: 27rpx;
+    color: #666666;
+  }
+  
+  .sku-names {
+    display: flex;
+    font-size: 29rpx;
+    color: #333;
+    margin: 0 40rpx;
+    text-align: center;
+    flex-wrap: wrap;
+    margin-bottom: 20rpx;
+    justify-content: space-between;
+  }
+  
+  .sku-name-item {
+    background: #EFEFEF;
+    border: 1rpx solid #EFEFEF;
+    /* width: 318rpx; */
+    line-height: 77rpx;
+    border-radius: 14rpx;
+    margin-bottom: 25rpx;
+    margin-right: 30rpx;
+    max-width: 100%;
+    padding: 0 15rpx;
+    min-width: 270rpx;
+  }
+  
+  .sku-name-item:nth-child(2n) {
+    margin-right: 0;
+  }
+  
+  .sku-name-item.active {
+    color: #0B898E;
+    border-color: #0B898E;
+    background: rgba(11, 137, 142, 0.1);
+  }
+  
+  .number-box {
+    display: flex;
+    align-items: center;
+    border-top: 1rpx solid #ccc;
+    justify-content: space-between;
+    margin: 0 40rpx;
+    padding: 40rpx 0;
+  }
+  
+  .number-box text {
+    flex: 1;
+    font-size: 29rpx;
+    color: #333;
+  }
+  
+  .number-box view {
+    border: 1rpx solid #666;
+    border-radius: 7rpx;
+    text-align: center;
+    width: 67rpx;
+    line-height: 67rpx;
+    font-size: 33rpx;
+    color: #000;
+  }
+  
+  .number-box view.disable {
+    border-color: #ccc;
+    color: #999;
+  }
+  
+  .number-box view.number {
+    width: 94rpx;
+    margin: 0 15rpx;
+  }
+  
+  .btn-box {
+    height: 138rpx;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
+  .mask-btn {
+    width: 670rpx;
+    line-height: 78rpx;
+    background: #D62828;
+    border-radius: 39rpx;
+    color: #fff;
+    text-align: center;
+    font-size: 33rpx;
+    font-weight: 500;
+  }
+  
+  .mask-btn.disable {
+    background: #ccc;
+  }

pages/order/pay/index.js

@@ -64,8 +64,20 @@ Page({
     this.setData({
       id:options.id
     })
+    this.getUserInfo()
     
   },
+
+  getUserInfo () {
+    commonApi.user_post("uservice/user/getMyInfo",{}).then(res => {
+        if (res && res.data) {
+            wx.setStorageSync('jstrip_userid', res.data.id)
+            wx.setStorageSync('jstrip_token', res.data.token)
+            wx.setStorageSync('jstrip_userInfo', res.data)
+        }
+    })
+  },
+
   daojishi:function(time){
     let now = new Date().getTime();
     if(now>time){

pages/order/postOrder/index.wxml

@@ -25,7 +25,7 @@
     <view class="number-box">{{item.productNum}}</view>
     <view wx:if="{{!kjId && !gp_id}}" class="iconfont icon-add-select" bindtap="add" data-index="{{index}}"></view>
   </view>
-  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;">
+  <view class="box-title" style="height:auto;min-height:126rpx;position: relative;" wx:if="{{item.sku.is_batch_shipment}}">
     <view style="flex:1;white-space:nowrap;margin-right:20rpx;">收货方式</view>
     <view class="batch-view">
         <view class="flex" bind:tap="changeBatchShip" data-item="{{item}}" data-value="{{0}}" data-index="{{index}}">
@@ -47,7 +47,8 @@
   <view class="box-title" style="height:auto;min-height:113rpx;">
     <view style="flex:1;white-space:nowrap;margin-right:20rpx;">运费</view>
     <view style="display: flex;">
-        <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text>
+        <!-- <text>{{item.postFee?(item.postFee==0?'包邮':("￥"+(item.postFee/100))):item.sku.sku_model.post_template_name}}</text> -->
+        <text>{{item.postFee?("￥"+(item.postFee/100)):"包邮"}}</text>
         <view wx:if="{{item.postFee>0 && item.sku.batch_shipment==1}}">
             <text style="padding-left: 10rpx;">x{{item.sku.batch_count}}</text>
             <text style="padding-left: 40rpx;">￥{{(item.postFee/100)*item.sku.batch_count}}</text>

pages/user/profile/index.wxml

@@ -16,11 +16,11 @@
   <view style="font-size:30rpx" class="info">{{info.nickname}}</view>
   <view class="iconfont icon-you"></view>
 </navigator>
-<navigator url="../email/index" class="profile-item" wx:if="{{info}}">
+<!-- <navigator url="../email/index" class="profile-item" wx:if="{{info}}">
   <text>邮箱</text>
   <view class="info">{{info.email}}</view>
   <view class="iconfont icon-you"></view>
-</navigator>
+</navigator> -->
 <navigator url="../bindtel/index" class="profile-item" wx:if="{{info}}">
   <text>手机号</text>
   <view class="info">{{info.mobile?info.mobile:''}}</view>

pages/user/user.js

@@ -30,8 +30,8 @@ Page({
     })
   },
   supplier:function(){
-    let url = "https://m.cloud.sz-trip.com/Audit"
-    app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"
+    let url = "https://m.cloud.sz-trip.com/ShoppingUnit"
+    app.globalData.weburl = "https://m.cloud.sz-trip.com/ShoppingUnit"
     wx.navigateTo({
       url: '/pages/pbService/web/index?weburl='+ encodeURIComponent(url)
     })

pages/user/user.wxml

@@ -63,9 +63,9 @@
       购物车
     </navigator>
 
-    <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
+    <!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
       团体预约订单
-    </navigator>
+    </navigator> -->
     <navigator url="videoCoupon/index" class="user-box-line">
     		中奖记录
     </navigator>
@@ -81,9 +81,7 @@
     <navigator url="likes/index" class="user-box-line" catchtap="pagePoint" data-event="mine_collection">
       我的收藏
     </navigator>
-    <view bindtap="supplier" class="user-box-line">
-    商户审核
-    </view>
+    <view bindtap="supplier" class="user-box-line">商户入驻</view>
     <!-- <navigator url="/pages/group/mine/index" class="user-box-line">
     我的团购
     </navigator>