d

app.js

@@ -137,8 +137,8 @@ App({
     fromUserId : '',//分享者的id
     fromUserRole : '',//分享者的role
     //servsers: "https://52yqf.cn/",
-    //servsers: "https://www.daliangzao.net/",//正式库
-    servsers: "https://dlz.info666.com/",//测试域名库
+     servsers: "https://www.daliangzao.net/",//正式库
+    //servsers: "https://dlz.info666.com/",//测试域名库
     //servsers: "https://tt.daliangzao.net/",//测试库
     appid: 'wxf9a0ddcb8c70b939',//appid
     secret: 'a009cb3e46c8ecef9c54a50522f11823',//secret

pages/buy/buy.wxml

@@ -107,11 +107,11 @@
     
     <view   bindtap='linkCart' class="footer_left_each  footer_left_cart">
       <icon class='iconfont icon-gouwuche'></icon>
-      <view>购物车</view>
-      <view  wx:if="{{cartNum != 0}}"  class="cart_num">
+      <view>购物车<text class='car-num' wx:if="{{cartNum != 0}}">{{cartNum}}</text></view>
+      <!-- <view  wx:if="{{cartNum != 0}}"  class="cart_num">
         <image  src='/images/buy_cart_num.png'  class="cart_num_icon"></image>
         <view class='cart_num_num c-white' >{{cartNum}}</view>
-      </view>
+      </view> -->
     </view>
   </view>
   <block wx:if="{{soldOutShow}}">

pages/buy/buy.wxss

@@ -344,6 +344,18 @@ button.share_wrap .collect_icon{
   font-size:42rpx;
   margin:10rpx 0 6rpx;
 }
+.footer_left_each .car-num{
+  background:#ed4451;
+  color:#fff;
+  width:40rpx;
+  height:40rpx;
+  text-align: center;
+  line-height:40rpx;
+  border-radius:50%;
+  position: absolute;
+  top:0;
+  right:20rpx;
+}
 .navigator-hover{
   background-color:rgba(35,35,35,0);
   opacity: 1;

pages/confirmOrder/confirmOrder.js

@@ -652,7 +652,7 @@ Page({
   insertEachGoods: function (i, timestamp, timestamp1, coupon_id, un_id, formId){
     var that = this;
     var host = getApp().globalData.servsers;
-
+    console.log(that.data.carts);
     wx.request({
       url: host + "orderaffapi/insertOrderAff",
       data: {

pages/index/index.js

@@ -337,10 +337,7 @@ Page({
         });
       }
     }); 
-    //商品推荐
-    that.getGoodsRecommendList(that);
-    // 按照时间排序
-    that.getGoodsNews(that)
+    
   },
 
   onReady:function(e){
@@ -441,6 +438,14 @@ Page({
   onShow:function(){
     var that = this;
     that.onLoad();  
+    //商品推荐
+    that.getGoodsRecommendList(that);
+    // 按照时间排序
+    that.setData({
+      goodsNewsArray:[],
+      page:1,
+    })
+    that.getGoodsNews(that)
     if (wx.getStorageSync('channelIdObj').channelId) {
       that.setData({
         loginStatic: true,

pages/kind/index.js

@@ -26,10 +26,15 @@ Page({
     loginStatic: false, //登陆状态，默认为false
   },
   onLoad(){
-    this.getNavList(this);
+    
   },
   onShow(){
     let that = this;
+    that.setData({
+      goodsList:[],
+      page:1,
+    })
+    that.getNavList(that);
     if (wx.getStorageSync('channelIdObj').channelId) {
       that.setData({
         loginStatic: true,

pages/orderList/orderList.js

@@ -192,8 +192,14 @@ Page({
     
   },
   seePayOrder(e){
-    let that = this, imgSrc =(host+ e.currentTarget.dataset.src).split(',') 
-   
+    let that = this, imgSrc =[];
+    if (e.currentTarget.dataset.src[0].pay_order){
+      imgSrc.push(host+e.currentTarget.dataset.src[0].pay_order)
+    }
+    if (e.currentTarget.dataset.src[0].final_payment) {
+      imgSrc.push(host +e.currentTarget.dataset.src[0].final_payment)
+    }
+    console.log(imgSrc)
     wx.previewImage({
       current: imgSrc[0],
       urls: imgSrc

pages/orderList/orderList.wxml

@@ -18,7 +18,7 @@
         <view class='f-item'>订单：{{item.order_number}}</view>
         <view wx:if="{{item.order_sta ==2}}">待审核</view>
         <view wx:if="{{item.order_sta ==3}}">审核通过</view>
-        <view class='mar-l20' wx:if="{{item.list_order_aff_data[0].pay_order}}" data-src="{{item.list_order_aff_data[0].pay_order}}" bindtap='seePayOrder'>查看凭证</view>
+        <view class='mar-l20' wx:if="{{item.list_order_aff_data[0].pay_order}}" data-src="{{item.list_order_aff_data}}" bindtap='seePayOrder'>查看凭证</view>
       </view>
       
       <view class='f-box mar-b20' wx:for="{{item.list_order_aff_data}}" wx:for-item="orderItem">
@@ -31,7 +31,7 @@
             <view class='f-item mar-r20'>
               <view>{{orderItem.com_dz}}  {{orderItem.com_lh}}  {{orderItem.com_style1}}</view>
             </view>
-            <view>×{{orderItem.order_num}}</view>
+            <view>×{{orderItem.com_num}}</view>
           </view>
         </view>
       </view>
@@ -40,10 +40,10 @@
         <view class='f-item f-box f-justify-content-end mar-r26'>
           <view class='btn' wx:if="{{item.order_sta ==1 || item.order_sta ==2}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg'>{{item.list_order_aff_data[0].pay_order ? "修改凭证" :"上传凭证"}}</view>
           <!-- <view class='btn' wx:if="{{item.order_sta ==4}}">查看物流</view> -->
-          <view class='btn' wx:if="{{item.order_sta ==4}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg' >{{item.list_order_aff_data[0].pay_order ? "修改尾款单凭证" :"上传尾款单凭证"}}</view>
+          <view class='btn' wx:if="{{item.order_sta ==4}}" data-index="{{index}}" data-orderId="{{item.order_number}}" bindtap='uploadImg' >{{item.list_order_aff_data[0].final_payment ? "修改尾款单凭证" :"上传尾款单凭证"}}</view>
         </view>
         
-        <view>合计:<text class='c-theme'>¥ {{item.com_price_total}}</text></view>
+        <view>合计:<text class='c-theme'>¥ {{item.order_Price}}</text></view>
       </view>
     </view>
   </view>

pages/patternMenu/patternMenu.js

@@ -48,7 +48,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.getGiftNavTab(this)
+   
   },
 
   /**
@@ -63,6 +63,11 @@ Page({
    */
   onShow: function () {
     let that = this;
+    that.getGiftNavTab(that)
+    that.setData({
+      goodsList:[],
+      page:1,
+    })
     if (wx.getStorageSync('channelIdObj').channelId) {
       that.setData({
         loginStatic: true,