渠道下单和分享修改

pages/buy/buy.js

@@ -206,6 +206,7 @@ Page({
       specialGoodMsgShowCount: 0,//特定具有时效性的商品，提示显示次数
       cont_hidden: '',
       isSelectNew: 0,  //默认
+      loginStatic: false, //登陆状态，默认为false
     })
   },
 
@@ -347,9 +348,6 @@ Page({
       }
     })
   },
-
-
-
   //渲染
   loadFun: function (e) {
     var that = this;
@@ -862,6 +860,11 @@ Page({
       }
     })
     that.loadFun();
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
   },
 
 
@@ -2191,6 +2194,7 @@ Page({
             style5_name: styleName5,
             style5: styleId5,
             comGroupId: saveStyleId,//商品组合规格id
+            channel_account_id: wx.getStorageSync('channelIdObj').channelAccountId ? wx.getStorageSync('channelIdObj').channelAccountId : ""
           },
           method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
           header: {

pages/buy/buy.wxml

@@ -41,9 +41,10 @@
       <view class="goods_infor  clearfix">
         <view class="goods_price">
         <!-- newPrice -->
-          <text class="new_price">￥{{minPrice == maxPrice ? minPrice : (minPrice + '-' + maxPrice)}}</text>   
+          <text wx:if="{{commodityChannelPrice && loginStatic}}" class='channel-price c-theme'>￥{{commodityChannelPrice}}</text>
+          <text class="new_price {{commodityChannelPrice && loginStatic ? 'price-cancel' : ''}}">￥{{minPrice == maxPrice ? minPrice : (minPrice + '-' + maxPrice)}}</text>   
           <!-- <text class="old_price"  decode="true" >&nbsp;￥{{oldPrice}}&nbsp;&nbsp;</text> -->
-          <text wx:if="{{commodityChannelPrice}}">渠道价:￥<text class='c-theme'>￥{{commodityChannelPrice}}</text></text>
+          
         </view>
         <view class="goods_limit  clearfix">
           <view class='goods_limit_each'>

pages/buy/buy.wxss

@@ -842,4 +842,7 @@ contact-button {
   width: 100%;
   height: 100%;
   background-color: #fff;
+}
+.channel-price{
+  font-size:50rpx;
 }

pages/car/index.js

@@ -161,7 +161,8 @@ Page({
       wx.request({
         url: host + "commodityapi/commoditview",
         data: {
-          com_id: carts[cartsLength].com_id
+          com_id: carts[cartsLength].com_id,
+          channel_id: wx.getStorageSync('channelIdObj').channelId ? wx.getStorageSync('channelIdObj').channelId : ""
         },
         method: 'GET', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
         header: {

pages/confirmOrder/confirmOrder.js

@@ -660,7 +660,7 @@ Page({
 
         console.log("插入");
         console.log(res);
-        wx.setStorageSync('orderImg', res.data)
+        // wx.setStorageSync('orderImg', res.data)
         if ((that.data.carts[i].process_name != '') && (that.data.carts[i].process != -1)) {
           that.setData({
             stateNum: that.data.stateNum + 1
@@ -887,7 +887,7 @@ Page({
                 }
                 // 生产订单中
                 wx.navigateTo({
-                  url: '/pages/orderCanvas/orderCanavs?carts=' + that.data.cartsOrder,
+                  url: '/pages/orderCanvas/orderCanavs?orderId=' + timestamp1,
                 })
 
               } else {

pages/index/index.js

@@ -120,6 +120,7 @@ Page({
     page:1, //默认第一页
     limit:10, //展示的数量
     requestState:true, //请求状态，默认是有数据的
+    loginStatic:false, //登陆状态，默认为false
   },
 
   //tab切换
@@ -440,6 +441,11 @@ Page({
   onShow:function(){
     var that = this;
     that.onLoad();  
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
   },
 
   //跳转到“发现”tab页

pages/index/index.wxml

@@ -150,8 +150,8 @@
                 <!-- <view class='goods-summry'>产品描述产品描述产品描述</view> -->
               </view>
               <view class='f-box'>
-                <view class='c-theme f-item'>￥{{item.commodity_sale}}</view>
-                <view wx:if="{{item.commodityChannelPrice}}">渠道价：<text class='c-theme'>￥{{item.commodityChannelPrice}}</text></view>
+                <view class='c-theme' wx:if="{{loginStatic && item.commodityChannelPrice}}">￥{{item.commodityChannelPrice}}</view>
+                <view class='c-theme f-item {{loginStatic && item.commodityChannelPrice ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
               </view>
             </view>
           </view>
@@ -165,8 +165,8 @@
               <!-- <view class='goods-summary'></view> -->
               <view class='goods-title'>{{item.commodity_name}}</view>
               <view class='f-box'>
-                <view class='c-theme f-item'>￥{{item.commodity_sale}}</view>
-                <view wx:if="{{item.commodityChannelPrice}}">渠道价：<text class='c-theme'>￥{{item.commodityChannelPrice}}</text></view>
+                <view wx:if="{{item.commodityChannelPrice && loginStatic}}" class='c-theme'>￥{{item.commodityChannelPrice}}</view>
+                <view class='c-theme f-item {{item.commodityChannelPrice && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
               </view>
             </view>
           </view>

pages/kind/index.js

@@ -23,13 +23,18 @@ Page({
     limit:10, //分页大小
     priceSort: null, //价格排序 desc asc
     timeSort: null, //时间排序 desc asc
-
+    loginStatic: false, //登陆状态，默认为false
   },
   onLoad(){
     this.getNavList(this);
   },
   onShow(){
-
+    let that = this;
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
   },
   onReachBottom: function () {
     if (this.data.requestState) {

pages/kind/index.wxml

@@ -89,10 +89,10 @@
             <image src='{{host}}/images/{{item.logo[0]}}' class='goods-img' mode='aspectFit'></image>
             <!-- <view class='goods-summary'></view> -->
             <view class='goods-title'>{{item.commodity_name}}</view>
-            <!-- <view class='f-box'> -->
-              <view class='goods-price'>￥{{item.commodity_sale}}</view>
-              <view class='mar-t10' wx:if="{{item.commodity_channel_price}}">渠道价:<text class='c-theme'>￥{{item.commodity_channel_price}}</text></view>
-            <!-- </view> -->
+            <view class='f-box'>
+                <view wx:if="{{item.commodity_channel_price && loginStatic}}" class='c-theme'>￥{{item.commodity_channel_price}}</view>
+                <view class='c-theme f-item {{item.commodity_channel_price && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
+              </view>
           </view>
         </view>
         

pages/kindSecondList/kindSecondList.js

@@ -8,6 +8,7 @@ Page({
     page:0, // 表示从第一页开始
     limit:10, // 每页10条数据
     requestState:true, // 表示可以请求
+    loginStatic: false //登陆状态，默认为false
   },
   onLoad: function (options) {
     var that = this;
@@ -77,6 +78,15 @@ Page({
     // })
     
   },
+  onShow(){
+    let that = this;
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
+
+  },
   //滚动到底部触发事件  
   /**
   * 页面上拉触底事件的处理函数
@@ -98,9 +108,11 @@ Page({
         id:id
       },
       success(res){
-        that.setData({
-          forid:res.data.rows[0].id
-        })
+        if(res.data.rows.length > 0){
+          that.setData({
+            forid: res.data.rows[0].id
+          })
+        }
         that.getGoodsList(that)
       }
     })
@@ -109,6 +121,7 @@ Page({
     let data = {
       offset: that.data.page,
       limit: that.data.limit,
+      channelId: wx.getStorageSync('channelIdObj').channelId ? wx.getStorageSync('channelIdObj').channelId : ""
     }
     if (that.data.forid) {
       data.commodity_levelTwo = that.data.forid

pages/kindSecondList/kindSecondList.wxml

@@ -26,9 +26,9 @@
             <!-- <view class='goods-summary'></view> -->
             <view class='goods-title'>{{item.commodity_name}}</view>
             <view class='f-box'>
-              <view class='c-theme f-item'>￥{{item.commodity_sale}}</view>
-              <view wx:if="{{item.commodityChannelPrice}}">渠道价:<text class='c-theme'>￥{{item.commodityChannelPrice}}</text></view>
-            </view>
+                <view wx:if="{{item.commodity_channel_price && loginStatic}}" class='c-theme'>￥{{item.commodity_channel_price}}</view>
+                <view class='c-theme f-item {{item.commodity_channel_price && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
+              </view>
           </view>
         </view>
       </view>

pages/mine/mine.wxml

@@ -12,7 +12,7 @@
     <view class='user-right'>
       <view class="userinfo-nickname">{{userInfo.nickName}}</view>
       <view wx:if="{{!userInfo.phone}}" class='user-phone' bindtap='bindPhone'>点击绑定手机号</view>
-      <view class='user-tel'>{{tel}} </view>
+      <view class='user-tel' wx:else>{{tel}} </view>
     </view>
   </view>
 

pages/orderCanvas/orderCanavs.js

@@ -7,23 +7,18 @@ Page({
    * 页面的初始数据
    */
   data: {
-    carts:null,
     orderImg:null,
-    host:host
+    host:host,
+    params:null
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var that = this, carts = options.carts;
-    carts = carts.replace(/zss/g, "&");
-    carts = JSON.parse(carts);
-
-
+    var that = this
     that.setData({
-      carts: carts,
-      orderImg:wx.getStorageSync('orderImg')
+      params: options,
     })
   },
 
@@ -38,7 +33,8 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    let that = this;
+    that.getImg(that)
   },
 
   /**
@@ -75,13 +71,13 @@ Page({
   onShareAppMessage() {
     return {
       // title: '',
-      path: '/pages/orderCanvas/orderCanavs'
+      path: '/pages/orderCanvas/orderCanavs?orderId='+this.data.params.orderId +'&&static=true'
     }
   },
-  orderList(){
+  returnHome(){
     // 查看订单
     wx.navigateTo({
-      url: '/pages/orderList/orderList?state=0',
+      url: '/pages/index/index',
     })
   },
   uploadImg() {
@@ -119,5 +115,20 @@ Page({
       }
     })
 
+  },
+  getImg(that){
+    wx.request({
+      url: host+'/orderapi/getOrderShareById',
+      data:{
+        orderId:that.data.params.orderId
+      },
+      method:"get",
+      success(res){
+        console.log(res,"内容")
+        that.setData({
+          orderImg:res.data
+        })
+      }
+    })
   }
 })

pages/orderCanvas/orderCanavs.wxml

@@ -1,29 +1,5 @@
-<!-- <view class='canvas-box'>
-  <image src='../../images/canvas_order.png' mode='widthFix'></image>
-</view> -->
-<view>
-<!-- <block wx:for="{{carts}}" wx:key="index"  wx:for-index="{{i}}"> 
-  <view class="goods_infor">
-    <view class="each_goods">
-      <image src="{{item.logo}}" class="goods_img"></image>
-      <view class="goods_cont">
 
-        <view class="goods_price">￥<text>{{item.new_price}}</text></view>
-        <view class="goods_name">{{item.name}}</view>
-        <view class="goods_style"> 
-          <text wx:if="{{item.style1_name}}">{{item.style1_name}} </text>
-          <text wx:if="{{item.style2_name}}">{{item.style2_name}} </text>
-          <text wx:if="{{item.style3_name}}">{{item.style3_name}} </text>
-          <text wx:if="{{item.style4_name}}">{{item.style4_name}} </text>
-          <text wx:if="{{item.style5_name}}">{{item.style5_name}} </text>
-          <text wx:if="{{item.giftbox_name}}">{{item.giftbox_name}} </text>
-          <text wx:if="{{item.process_name}}">{{item.process_name}}</text>
-        </view>
-        <view class="goods_num">x{{item.num}}</view>
-      </view>
-    </view> 
-  </view>
- </block>  -->
+<view>
  <image src='{{host}}{{orderImg}}' class='order-img' mode='widthFix'></image>
 </view>
 <view class='footer'>
@@ -32,8 +8,8 @@
       <view class='f-item f-box f-justify-content-center c-white bg-orange' style='width:100%'>
         <button class='share-box f-item f-s32' open-type="share">分享</button>
       </view>
-      <view class='f-item f-box f-justify-content-center c-white f-s32' style='width:100%;background:#eea957' bindtap='uploadImg'>上传付款凭证</view>
-      <view class='f-item f-box f-justify-content-center c-white bg-theme f-s32' style='width:100%' bindtap='orderList'>查看订单</view>
+      <view wx:if="{{!params.static}}" class='f-item f-box f-justify-content-center c-white f-s32' style='width:100%;background:#eea957' bindtap='uploadImg'>上传付款凭证</view>
+      <view class='f-item f-box f-justify-content-center c-white bg-theme f-s32' style='width:100%' bindtap='returnHome'>首页</view>
     </view>
   </view>
 </view>

pages/patternMenu/patternMenu.js

@@ -41,6 +41,7 @@ Page({
     priceSort: null, //价格排序，默认降序
     timeSort: null, //价时间排序，默认降序
     requestState:true, //默认是可以向下请求的
+    loginStatic: false, //登陆状态，默认为false
   },
 
   /**
@@ -61,7 +62,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    let that = this;
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
   },
 
   /**
@@ -190,6 +196,7 @@ Page({
       classId: that.data.isSelect,
       limit: that.data.limit, // 一页20条数据
       offset: that.data.page, //当前页数
+      channelId: wx.getStorageSync('channelIdObj').channelId ? wx.getStorageSync('channelIdObj').channelId : ""
     }
     if (that.data.priceSort) {
       data.priceSort = that.data.priceSort

pages/patternMenu/patternMenu.wxml

@@ -72,7 +72,10 @@
         <image src='{{host}}/images/{{item.logo[0]}}' class='goods-img' mode='aspectFit'></image>
         <!-- <view class='goods-summary'></view> -->
         <view class='goods-title'>{{item.commodity_name}}</view>
-        <view class='goods-price'>￥{{item.commodity_sale}}</view>
+        <view class='f-box'>
+          <view wx:if="{{item.commodityChannelPrice && loginStatic}}" class='c-theme'>￥{{item.commodityChannelPrice}}</view>
+          <view class='c-theme f-item {{item.commodityChannelPrice && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
+        </view>
       </view>
     </view>
     <divider wx:if="{{!requestState && page != 1}}"></divider>

pages/searchList/searchList.js

@@ -13,11 +13,19 @@ Page({
     page: 0, // 默认第一页
     limit: 10, // 每页请求最多数据
     requestState:true, //表示还可以请求
+    loginStatic: false, //登陆状态，默认为false
   }, 
 
 
  
-
+  onShow(){
+    let that = this;
+    if (wx.getStorageSync('channelIdObj').channelId) {
+      that.setData({
+        loginStatic: true,
+      })
+    }
+  },
   //滚动到底部触发事件  
   /**
   * 页面上拉触底事件的处理函数

pages/searchList/searchList.wxml

@@ -21,10 +21,10 @@
             <image src='{{item.commodity_logo}}' class='goods-img' mode='aspectFit'></image>
             <!-- <view class='goods-summary'></view> -->
             <view class='goods-title'>{{item.commodity_name}}</view>
-            <view class='f-box'>
-              <view class='c-theme f-item'>￥{{item.commodity_sale}}</view>
-              <view class='mar-t10' wx:if="{{item.commodity_channel_price}}">渠道价:<text class='c-theme'>￥{{item.commodity_channel_price}}</text></view>
-            </view>
+              <view class='f-box'>
+                <view wx:if="{{item.commodity_channel_price && loginStatic}}" class='c-theme'>￥{{item.commodity_channel_price}}</view>
+                <view class='c-theme f-item {{item.commodity_channel_price && loginStatic ? "price-cancel" : ""}}'>￥{{item.commodity_sale}}</view>
+              </view>
           </view>
         </view>
       </view>

style/customized.wxss

@@ -227,4 +227,11 @@ page{
   background:#fff;
   font-size:30rpx;
   z-index:100;
+}
+.price-cancel{
+  color:#999 !important;
+  text-decoration: line-through;
+  margin-left:10rpx;
+  font-size: 26rpx !important;
+  font-weight: normal !important;
 }