下单采购

app.json

@@ -88,7 +88,8 @@
     "components/component-made/made-solid",
     "components/data-none/data-none",
     "components/divider/divider",
-    "pages/login/login"
+    "pages/login/login",
+    "pages/orderCanvas/orderCanavs"
   ],
   "subpackages": [
     {

pages/buy/buy.js

@@ -1841,9 +1841,10 @@ Page({
   },
 
   //跳转到购物车
-  linkCart: function (e) {
-    wx.navigateTo({
-      url: '/pages/carInsert/carInsert'
+  linkCart(e) {
+    console.log(e)
+    wx.switchTab({
+      url: '/pages/car/index',
     })
   },
 

pages/buy/buy.wxml

@@ -108,7 +108,7 @@
       <view>购物车</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'>{{cartNum}}</view>
+        <view class='cart_num_num c-white' >{{cartNum}}</view>
       </view>
     </view>
   </view>

pages/car/index.wxml

@@ -74,10 +74,10 @@
 <block wx:if="{{shixiao_num > 0}}">
   <!-- <view  wx:if="{{hasList}}" > -->
       <!-- 标题 -->
-      <view class='like_title_wrap'>
+      <!-- <view class='like_title_wrap'>
           <view class='like_line'></view>
           <view class='like_title'>失效宝贝</view>
-      </view>
+      </view> -->
       <view class="cart-box">
           <view class="cart-list  shixiao_cart_list" wx:for="{{carts}}" wx:key="{{index}}">
             <!-- 失效 / 无库存 -->

pages/confirmOrder/confirmOrder.js

@@ -287,6 +287,7 @@ Page({
     var user_phone = that.data.user_phone;
 
     var formId = e.detail.formId;
+    
     console.log("mineGiftList - formId1:" + formId);
 
     if (user_phone == '' || user_phone == null || user_phone == undefined){
@@ -295,6 +296,9 @@ Page({
       })
       return false;
     }
+    wx.showLoading({
+      title: '订单合成中',
+    })
 
     var pages = getCurrentPages();
     var currPage = pages[pages.length - 1];  //当前页面
@@ -604,6 +608,13 @@ Page({
         }
       })
     }
+    setTimeout(()=>{
+      wx.hideLoading();
+      wx.navigateTo({
+        url: '/pages/orderCanvas/orderCanavs',
+      })
+    },1000)
+   
   },
 
   //插入订单中的每一样商品

pages/confirmOrder/confirmOrder.wxml

@@ -90,7 +90,7 @@
       </form>
     </block>
     <block wx:else>
-      <view class="footer_right  {{footer_right_gray}}" >去付款</view>
+      <view class="footer_right  {{footer_right_gray}}" >立即采购</view>
     </block>
 
     <view class="footer_left">
@@ -105,7 +105,7 @@
  <view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">
   <view class="modal  {{hiddenmodal ? 'hidden' : ''}}">{{modalCont}}</view>
 </view> 
-<view wx:if="{{maskBg}}" class="modal_bg "></view>
+<!-- <view wx:if="{{maskBg}}" class="modal_bg "></view> -->
 
 
 <view class="modal_wrap  {{hiddenmodal ? 'hidden' : ''}}">

pages/orderCanvas/orderCanavs.js

@@ -0,0 +1,66 @@
+// pages/orderCanvas/orderCanavs.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/orderCanvas/orderCanavs.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/orderCanvas/orderCanavs.wxml

@@ -0,0 +1,12 @@
+<view class='canvas-box'>
+  <image src='../../images/canvas_order.png' mode='widthFix'></image>
+</view>
+
+<view class='footer'>
+  <view class='footer-box'>
+    <view class='f-box'>
+      <view class='f-item f-box f-justify-content-center c-white bg-orange' style='width:100%' >分享</view>
+      <view class='f-item f-box f-justify-content-center c-white bg-theme' style='width:100%'>上传付款凭证</view>
+    </view>
+  </view>
+</view>

pages/orderCanvas/orderCanavs.wxss

@@ -0,0 +1,4 @@
+/* pages/orderCanvas/orderCanavs.wxss */
+.canvas-box image{
+  width:100%;
+}

project.config.json

@@ -28,7 +28,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 23,
+			"current": 24,
 			"list": [
 				{
 					"id": 0,
@@ -190,6 +190,14 @@
 					"id": -1,
 					"name": "login",
 					"pathName": "pages/login/login",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "orderCanvas",
+					"pathName": "pages/orderCanvas/orderCanavs",
+					"query": "",
 					"scene": null
 				}
 			]