修改订单业务

huangyCode
Commit c9f7a3e693c78ea7d551f18bbcd0d66c5bc405ed 1 parent 518e1608
Showing 12 changed files with 40 additions and 28 deletions
src/components/checkstore/checkstore.js
src/components/order/orderaction.js
src/components/order/orderaction.json
src/components/order/orderaction.wxml
src/components/order/orderproductinfo.js
src/components/order/orderproductinfo.wxml
src/pages/orderDetail/index.wxml
src/pages/orderList/index.js
src/pages/orderList/index.json
src/pages/orderList/index.wxml
src/pages/orderList/orderlistcell.json
src/pages/orderList/orderlistcell.wxml
--- a/src/components/checkstore/checkstore.js
View file @c9f7a3e
+++ b/src/components/checkstore/checkstore.js
View file @c9f7a3e
 import api from './checkstoreService';
+import event from '../../utils/event.js'
 const storeApi = new api();
 Component({
@@ -34,9 +35,9 @@ Component({
         this.dialog = this.selectComponent("#dialog");
         wx.getLocation({
           success: (res) => {
-            param.user_latitude = '32.049999';
-            param.user_longitude = '118.790001';
-            param.store_id = this.properties.storeId;
+            param.user_latitude = res.latitude;
+            param.user_longitude = res.longitude;
+            param.store_id = this.properties.storeId
             storeApi.checkStore(param, () => {
               wx.hideLoading();
             }).then(r => {
--- a/src/components/order/orderaction.js
View file @c9f7a3e
+++ b/src/components/order/orderaction.js
View file @c9f7a3e
@@ -21,6 +21,10 @@ Component({
     realPrice: String,
     orderCode:String,
     productId:String,
+    isStore:{
+      type:Boolean,
+      value: false
+    }
   },
   /**
@@ -33,7 +37,7 @@ Component({
   },
   lifetimes: {
-    
+
   },
 attached: function () {
@@ -44,14 +48,14 @@ attached: function () {
     console.log("lastIndex===" + lastIndex);
     that.setData({ lastIndex: lastIndex });
   }
-  
+
   if (that.data.timer) {
     let leftTime = that.data.lefttime;
     let timer = that.data.timer;
-    
+
     if(timer > 0){
       let interval = setInterval(() => {
-        timer = timer - 1; 
+        timer = timer - 1;
         leftTime = formatTimeByMin(timer, 'm:s');
         if (timer <= 0) {
           leftTime = '00:00'
@@ -63,7 +67,7 @@ attached: function () {
       }, 1000);
       that.setData({ interval: interval});
     }
-    
+
   }
 },
@@ -74,7 +78,7 @@ detached: function () {
   }
 },
-  
+
   /**
    * 组件的方法列表
@@ -85,14 +89,13 @@ detached: function () {
       let actionCode = e.currentTarget.dataset.buttonCode;
       let orderCode = e.currentTarget.dataset.orderCode;
       let productId = e.currentTarget.dataset.productId;
-      
+
       if (actionCode == BUY_AGAIN) {
         let params = {
           id: productId
         }
         router.go('productDetail', params);
       } else if (actionCode == NOW_BUY){
-        console.log("== 去支付页面===")
         prePay(productId, orderCode, 1);
       } else if (actionCode == SHOW_DETAIL) {
         let params = {
@@ -107,9 +110,9 @@ detached: function () {
       } else {
         showDialog(orderCode, actionCode, 0);
       }
-     
+
     },
-   
+
   }
--- a/src/components/order/orderaction.json
View file @c9f7a3e
+++ b/src/components/order/orderaction.json
View file @c9f7a3e
 {
   "component": true,
   "usingComponents": {
+
   }
-}
+}
--- a/src/components/order/orderaction.wxml
View file @c9f7a3e
+++ b/src/components/order/orderaction.wxml
View file @c9f7a3e
@@ -10,10 +10,10 @@
     <text class='order-daction-pay-amount-title-txt'>{{lefttime}}</text>
   </view>
 </view>
-  
+
 <view class='order-action-bottom-button-view'>
   <block wx:for="{{buttons}}" wx:key="{{index}}">
     <button class='{{index == lastIndex ? "order-action-selected-button":"order-action-unselected-button"}}' catchtap='onButtonClick' data-button-code='{{item.code}}' data-order-code='{{orderCode}}' data-product-id='{{productId}}'>{{item.text}}</button>
-  </block> 
+  </block>
 </view>
 </view>
--- a/src/components/order/orderproductinfo.js
View file @c9f7a3e
+++ b/src/components/order/orderproductinfo.js
View file @c9f7a3e
 // src/components/order/orderproductinfo.js
 Component({
-  
+
   /**
    * 组件的属性列表
    */
@@ -8,6 +8,10 @@ Component({
     productInfo: Object,
     statuStr:String,
     fromPage: Number,
+    isStore:{
+      type:Boolean,
+      value: false
+    }
   },
   /**
--- a/src/components/order/orderproductinfo.wxml
View file @c9f7a3e
+++ b/src/components/order/orderproductinfo.wxml
View file @c9f7a3e
@@ -9,6 +9,8 @@
       </view>
       <text class='component-order-product-name-txt'>{{productInfo.productName}}</text>
       </view>
-      <text class='component-order-size-color-txt'>{{productInfo.colorName}}，{{productInfo.sizeName}}</text>
+      <text class='component-order-size-color-txt' wx:if="{{isStore}}">{{productInfo.colorName}}，{{productInfo.sizeName}}，{{productInfo.skup}}</text>
+      <text class='component-order-size-color-txt' wx:else>{{productInfo.colorName}}，{{productInfo.sizeName}}，{{productInfo.skup}}</text>
+
     </view>
   </view>
--- a/src/pages/orderDetail/index.wxml
View file @c9f7a3e
+++ b/src/pages/orderDetail/index.wxml
View file @c9f7a3e
@@ -38,7 +38,7 @@
     <text class='order-detail-sum-grey-txt'>商品金额：</text>
     <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.goodPrice}}</text>
   </view>
-  <view class='order-detail-count-view'>
+  <view class='order-detail-count-view' wx:if="{{data.isOffline !== 'Y'}}">
     <text class='order-detail-sum-grey-txt'>运费：</text>
     <text class='order-detail-sum-grey-txt'>¥{{data.priceInfo.feePrice}}</text>
   </view>
@@ -53,7 +53,8 @@
   </view>
   <view class='order-detail-order-code-view'>
     <text class='order-detail-create-time-txt'>订单编号：</text>
-    <text class='order-detail-create-time-txt'>{{data.orderCode}}</text>
+    <text class='order-detail-create-time-txt' wx:if="{{data.isOffline !== 'Y'}}">{{data.orderCode}}</text>
+    <text class='order-detail-create-time-txt' wx:else>{{data.orderCode}} (门店订单)</text>
     <image class='order-detail-order-copy-image' bindtap='onCopyOrderCode' src='../../assets/images/copyordercode@3x.png'></image>
   </view>
   <view wx:if='{{data.payment}}' class='order-detail-pay-mode-view'>
--- a/src/pages/orderList/index.js
View file @c9f7a3e
+++ b/src/pages/orderList/index.js
View file @c9f7a3e
@@ -197,4 +197,4 @@ Page({
   }
-})
+})
--- a/src/pages/orderList/index.json
View file @c9f7a3e
+++ b/src/pages/orderList/index.json
View file @c9f7a3e
@@ -4,4 +4,4 @@
     "orderlistcell":"./orderlistcell",
     "no-data-show-view": "../../../components/no-data-show-view/no-data-show-view"
   }
-}
+}
--- a/src/pages/orderList/index.wxml
View file @c9f7a3e
+++ b/src/pages/orderList/index.wxml
View file @c9f7a3e
@@ -20,13 +20,13 @@
               </block>
               <view class="load_more_view" wx:if="{{tab.showLoadMoreView}}">加载中...</view>
             </scroll-view>
-          </block>  
+          </block>
           <block wx:else>
             <view class='empty'>
               <no-data-show-view></no-data-show-view>
             </view>
           </block>
       </swiper-item>
-    </swiper> 
+    </swiper>
   </view>
-</view>
+</view>
--- a/src/pages/orderList/orderlistcell.json
View file @c9f7a3e
+++ b/src/pages/orderList/orderlistcell.json
View file @c9f7a3e
@@ -4,4 +4,4 @@
     "orderproductinfo": "../../components/order/orderproductinfo",
     "orderaction": "../../components/order/orderaction"
   }
-}
+}
--- a/src/pages/orderList/orderlistcell.wxml
View file @c9f7a3e
+++ b/src/pages/orderList/orderlistcell.wxml
View file @c9f7a3e
 <!--src/pages/orderList/orderlistcell.wxml-->
 <view class='orderlistcell-root-container' data-order-code='{{item.orderCode}}' bindtap='onItemClick'>
-  <orderproductinfo id="orderproductinfo" product-info="{{item.goodsInfo}}" statu-str="{{item.statuStr}}">
+  <orderproductinfo id="orderproductinfo" product-info="{{item.goodsInfo}}" statu-str="{{item.statuStr}}" isStore="{{item.isOffline === 'Y'}}">
   </orderproductinfo>
   <view class='space-view'></view>
-  <orderaction id="orderaction" buttons="{{item.buttons}}" timer='{{item.leftTime}}' order-code="{{item.orderCode}}" product-id='{{item.goodsInfo.productId}}'/>
+  <orderaction id="orderaction" buttons="{{item.buttons}}" timer='{{item.leftTime}}' order-code="{{item.orderCode}}" product-id='{{item.goodsInfo.productId}}' storeId="{{item.storeId}}" isStore="{{item.isOffline === 'Y'}}"/>
   <view class='orderlistcell-root-split-line'></view>
 </view>