换系统

2019-12-23 10:04:09 +08:00
parent c890ad64a2
commit 9a53bca281
205 changed files with 4897 additions and 4734 deletions
--- a/components/orderconfirm/orderagreement/orderagreement.js
+++ b/components/orderconfirm/orderagreement/orderagreement.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderagreement/orderagreement.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})
+// components/orderconfirm/orderagreement/orderagreement.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
--- a/components/orderconfirm/orderagreement/orderagreement.json
+++ b/components/orderconfirm/orderagreement/orderagreement.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
--- a/components/orderconfirm/orderagreement/orderagreement.scss
+++ b/components/orderconfirm/orderagreement/orderagreement.scss
@@ -1,19 +1,19 @@
-.agree {
-    width: 690rpx;
-    // height: 96rpx;
-    line-height: 96rpx;
-    display: flex;
-    // border-bottom: 2rpx solid #EAEAEA;
-    margin: 0 auto;
-    color: #999999;
-    font-size: 26rpx;
-    .select {
-        width: 26rpx;
-        height: 26rpx;
-        margin: auto 0;
-        border-radius: 50%;
-        background-color: #EAEAEA;
-        margin-right: 25rpx;
-        margin-left: 31rpx;
-    }
+.agree {
+    width: 690rpx;
+    // height: 96rpx;
+    line-height: 96rpx;
+    display: flex;
+    // border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    color: #999999;
+    font-size: 26rpx;
+    .select {
+        width: 26rpx;
+        height: 26rpx;
+        margin: auto 0;
+        border-radius: 50%;
+        background-color: #EAEAEA;
+        margin-right: 25rpx;
+        margin-left: 31rpx;
+    }
 }
--- a/components/orderconfirm/orderagreement/orderagreement.wxml
+++ b/components/orderconfirm/orderagreement/orderagreement.wxml
@@ -1,4 +1,4 @@
-<view class="agree">
-     <view class="select"></view>
-     <text>同意使用条款和隐私政策</text>
+<view class="agree">
+     <view class="select"></view>
+     <text>同意使用条款和隐私政策</text>
 </view>
--- a/components/orderconfirm/orderagreement/orderagreement.wxss
+++ b/components/orderconfirm/orderagreement/orderagreement.wxss
@@ -1,18 +1,18 @@
-.agree {
-  width: 690rpx;
-  line-height: 96rpx;
-  display: flex;
-  margin: 0 auto;
-  color: #999999;
-  font-size: 26rpx;
-}
-
-.agree .select {
-  width: 26rpx;
-  height: 26rpx;
-  margin: auto 0;
-  border-radius: 50%;
-  background-color: #EAEAEA;
-  margin-right: 25rpx;
-  margin-left: 31rpx;
-}
+.agree {
+  width: 690rpx;
+  line-height: 96rpx;
+  display: flex;
+  margin: 0 auto;
+  color: #999999;
+  font-size: 26rpx;
+}
+
+.agree .select {
+  width: 26rpx;
+  height: 26rpx;
+  margin: auto 0;
+  border-radius: 50%;
+  background-color: #EAEAEA;
+  margin-right: 25rpx;
+  margin-left: 31rpx;
+}
--- a/components/orderconfirm/orderbottom/orderbottom.js
+++ b/components/orderconfirm/orderbottom/orderbottom.js
@@ -1,27 +1,28 @@
-// components/orderconfirm/orderbottom/orderbottom.js
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        sub() {
-            wx.navigateTo({
-                url: "/pages/order/order"
-            })
-        }
-    }
+// components/orderconfirm/orderbottom/orderbottom.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        price:String
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        sub() {
+            // wx.navigateTo({
+            //     url: "/pages/order/order"
+            // })
+            this.triggerEvent("sub")
+        }
+    }
 })
--- a/components/orderconfirm/orderbottom/orderbottom.json
+++ b/components/orderconfirm/orderbottom/orderbottom.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
--- a/components/orderconfirm/orderbottom/orderbottom.scss
+++ b/components/orderconfirm/orderbottom/orderbottom.scss
@@ -1,21 +1,21 @@
-.bottom {
-    width: 100%;
-    height: 99rpx;
-    line-height: 99rpx;
-    display: flex;
-    justify-content: space-between;
-    border-top: 2rpx solid #EAEAEA;
-    font-size: 28rpx;
-    .left {
-        margin-left: 59rpx;
-        .pri {
-            color: #E0C79D;
-            font-size: 26rpx;
-            margin-left: 19rpx;
-        }
-    }
-    .right {
-        color: #4CC97D;
-        margin-right: 38rpx;
-    }
+.bottom {
+    width: 100%;
+    height: 99rpx;
+    line-height: 99rpx;
+    display: flex;
+    justify-content: space-between;
+    border-top: 2rpx solid #EAEAEA;
+    font-size: 28rpx;
+    .left {
+        margin-left: 59rpx;
+        .pri {
+            color: #E0C79D;
+            font-size: 26rpx;
+            margin-left: 19rpx;
+        }
+    }
+    .right {
+        color: #4CC97D;
+        margin-right: 38rpx;
+    }
 }
--- a/components/orderconfirm/orderbottom/orderbottom.wxml
+++ b/components/orderconfirm/orderbottom/orderbottom.wxml
@@ -1,7 +1,7 @@
-<view class="bottom">
-    <view class="left">
-        <text>总计</text>
-        <text class="pri">$0.00</text>
-    </view>
-    <view class="right"  bindtap="sub">结算</view>
+<view class="bottom">
+    <view class="left">
+        <text>总计</text>
+        <text class="pri">${{price}}</text>
+    </view>
+    <view class="right"  bindtap="sub">结算</view>
 </view>
--- a/components/orderconfirm/orderbottom/orderbottom.wxss
+++ b/components/orderconfirm/orderbottom/orderbottom.wxss
@@ -1,24 +1,24 @@
-.bottom {
-  width: 100%;
-  height: 99rpx;
-  line-height: 99rpx;
-  display: flex;
-  justify-content: space-between;
-  border-top: 2rpx solid #EAEAEA;
-  font-size: 28rpx;
-}
-
-.bottom .left {
-  margin-left: 59rpx;
-}
-
-.bottom .left .pri {
-  color: #E0C79D;
-  font-size: 26rpx;
-  margin-left: 19rpx;
-}
-
-.bottom .right {
-  color: #4CC97D;
-  margin-right: 38rpx;
-}
+.bottom {
+  width: 100%;
+  height: 99rpx;
+  line-height: 99rpx;
+  display: flex;
+  justify-content: space-between;
+  border-top: 2rpx solid #EAEAEA;
+  font-size: 28rpx;
+}
+
+.bottom .left {
+  margin-left: 59rpx;
+}
+
+.bottom .left .pri {
+  color: #E0C79D;
+  font-size: 26rpx;
+  margin-left: 19rpx;
+}
+
+.bottom .right {
+  color: #4CC97D;
+  margin-right: 38rpx;
+}
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js
@@ -1,27 +1,27 @@
-// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
-Component({
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-        choose() {
-            wx.navigateTo({
-                url: "/pages/chooseaddr/chooseaddr"
-            })
-        }
-    }
+// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        choose() {
+            wx.navigateTo({
+                url: "/pages/chooseaddr/chooseaddr"
+            })
+        }
+    }
 })
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.json
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss
@@ -1,33 +1,33 @@
-.orderchooseaddr {
-    width: 690rpx;
-    height: 148rpx;
-    margin: 0 auto;
-    border-bottom: 2rpx solid #EAEAEA;
-    display: flex;
-    justify-content: space-between;
-    .left {
-        width: 572rpx;
-        height: 80rpx;
-        .userinfo {
-            color: #333333;
-            font-size: 26rpx;
-            text-indent: 30rpx;
-            margin-top: 41rpx;
-            display: flex;
-            justify-content: space-between;
-        }
-        .addr {
-            color: #999999;
-            font-size: 24rpx;
-            text-indent: 30rpx;
-            margin-top: 32rpx;
-        }
-    }
-    .right {
-        width: 17rpx;
-        height: 30rpx;
-        background-color: #D3D3D3;
-        margin: auto 0;
-        margin-right: 19rpx;
-    }
+.orderchooseaddr {
+    width: 690rpx;
+    height: 148rpx;
+    margin: 0 auto;
+    border-bottom: 2rpx solid #EAEAEA;
+    display: flex;
+    justify-content: space-between;
+    .left {
+        width: 572rpx;
+        height: 80rpx;
+        .userinfo {
+            color: #333333;
+            font-size: 26rpx;
+            text-indent: 30rpx;
+            margin-top: 41rpx;
+            display: flex;
+            justify-content: space-between;
+        }
+        .addr {
+            color: #999999;
+            font-size: 24rpx;
+            text-indent: 30rpx;
+            margin-top: 32rpx;
+        }
+    }
+    .right {
+        width: 17rpx;
+        height: 30rpx;
+        background-color: #D3D3D3;
+        margin: auto 0;
+        margin-right: 19rpx;
+    }
 }
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml
@@ -1,12 +1,12 @@
-<view class="orderchooseaddr" bindtap="choose">
-    <view class="left">
-        <view class="userinfo">
-            <text class="username">于于宇  15698857895</text>
-            <text>邮政编码：677467</text>
-        </view>
-        <view class="addr">
-            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
-        </view>
-    </view>
-    <view class="right"></view>
+<view class="orderchooseaddr" bindtap="choose">
+    <view class="left">
+        <view class="userinfo">
+            <text class="username">于于宇  15698857895</text>
+            <text>邮政编码：677467</text>
+        </view>
+        <view class="addr">
+            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
+        </view>
+    </view>
+    <view class="right"></view>
 </view>
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss
@@ -1,37 +1,37 @@
-.orderchooseaddr {
-  width: 690rpx;
-  height: 148rpx;
-  margin: 0 auto;
-  border-bottom: 2rpx solid #EAEAEA;
-  display: flex;
-  justify-content: space-between;
-}
-
-.orderchooseaddr .left {
-  width: 572rpx;
-  height: 80rpx;
-}
-
-.orderchooseaddr .left .userinfo {
-  color: #333333;
-  font-size: 26rpx;
-  text-indent: 30rpx;
-  margin-top: 41rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.orderchooseaddr .left .addr {
-  color: #999999;
-  font-size: 24rpx;
-  text-indent: 30rpx;
-  margin-top: 32rpx;
-}
-
-.orderchooseaddr .right {
-  width: 17rpx;
-  height: 30rpx;
-  background-color: #D3D3D3;
-  margin: auto 0;
-  margin-right: 19rpx;
-}
+.orderchooseaddr {
+  width: 690rpx;
+  height: 148rpx;
+  margin: 0 auto;
+  border-bottom: 2rpx solid #EAEAEA;
+  display: flex;
+  justify-content: space-between;
+}
+
+.orderchooseaddr .left {
+  width: 572rpx;
+  height: 80rpx;
+}
+
+.orderchooseaddr .left .userinfo {
+  color: #333333;
+  font-size: 26rpx;
+  text-indent: 30rpx;
+  margin-top: 41rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.orderchooseaddr .left .addr {
+  color: #999999;
+  font-size: 24rpx;
+  text-indent: 30rpx;
+  margin-top: 32rpx;
+}
+
+.orderchooseaddr .right {
+  width: 17rpx;
+  height: 30rpx;
+  background-color: #D3D3D3;
+  margin: auto 0;
+  margin-right: 19rpx;
+}
--- a/components/orderconfirm/orderchooseway/orderchooseway.js
+++ b/components/orderconfirm/orderchooseway/orderchooseway.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderchooseway/orderchooseway.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})
+// components/orderconfirm/orderchooseway/orderchooseway.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
--- a/components/orderconfirm/orderchooseway/orderchooseway.json
+++ b/components/orderconfirm/orderchooseway/orderchooseway.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
--- a/components/orderconfirm/orderchooseway/orderchooseway.scss
+++ b/components/orderconfirm/orderchooseway/orderchooseway.scss
@@ -1,30 +1,30 @@
-.chooseway {
-    width: 690rpx;
-    height: 96rpx;
-    line-height: 96rpx;
-    display: flex;
-    border-bottom: 2rpx solid #EAEAEA;
-    margin: 0 auto;
-    .item {
-        display: flex;
-        margin-right: 90rpx;
-        .select {
-            width: 26rpx;
-            height: 26rpx;
-            margin: auto 0;
-            border-radius: 50%;
-            background-color: #EAEAEA;
-        }
-        .selected {
-            background-color: #47C877;
-        }
-        .way {
-            color: #333333;
-            font-size: 26rpx;
-            text-indent: 17rpx;
-        }
-    }
-    .item1 {
-        margin-left: 31rpx;
-    }
+.chooseway {
+    width: 690rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    display: flex;
+    border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    .item {
+        display: flex;
+        margin-right: 90rpx;
+        .select {
+            width: 26rpx;
+            height: 26rpx;
+            margin: auto 0;
+            border-radius: 50%;
+            background-color: #EAEAEA;
+        }
+        .selected {
+            background-color: #47C877;
+        }
+        .way {
+            color: #333333;
+            font-size: 26rpx;
+            text-indent: 17rpx;
+        }
+    }
+    .item1 {
+        margin-left: 31rpx;
+    }
 }
--- a/components/orderconfirm/orderchooseway/orderchooseway.wxml
+++ b/components/orderconfirm/orderchooseway/orderchooseway.wxml
@@ -1,10 +1,10 @@
-<view class="chooseway">
-    <view class="item item1">
-        <view class="select selected"></view>
-        <text class="way">快递配送</text>
-    </view>
-    <view class="item">
-        <view class="select"></view>
-        <text class="way">到店自取</text>
-    </view>
+<view class="chooseway">
+    <view class="item item1">
+        <view class="select selected"></view>
+        <text class="way">快递配送</text>
+    </view>
+    <view class="item">
+        <view class="select"></view>
+        <text class="way">到店自取</text>
+    </view>
 </view>
--- a/components/orderconfirm/orderchooseway/orderchooseway.wxss
+++ b/components/orderconfirm/orderchooseway/orderchooseway.wxss
@@ -1,35 +1,35 @@
-.chooseway {
-  width: 690rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  display: flex;
-  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
-}
-
-.chooseway .item {
-  display: flex;
-  margin-right: 90rpx;
-}
-
-.chooseway .item .select {
-  width: 26rpx;
-  height: 26rpx;
-  margin: auto 0;
-  border-radius: 50%;
-  background-color: #EAEAEA;
-}
-
-.chooseway .item .selected {
-  background-color: #47C877;
-}
-
-.chooseway .item .way {
-  color: #333333;
-  font-size: 26rpx;
-  text-indent: 17rpx;
-}
-
-.chooseway .item1 {
-  margin-left: 31rpx;
-}
+.chooseway {
+  width: 690rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  display: flex;
+  border-bottom: 2rpx solid #EAEAEA;
+  margin: 0 auto;
+}
+
+.chooseway .item {
+  display: flex;
+  margin-right: 90rpx;
+}
+
+.chooseway .item .select {
+  width: 26rpx;
+  height: 26rpx;
+  margin: auto 0;
+  border-radius: 50%;
+  background-color: #EAEAEA;
+}
+
+.chooseway .item .selected {
+  background-color: #47C877;
+}
+
+.chooseway .item .way {
+  color: #333333;
+  font-size: 26rpx;
+  text-indent: 17rpx;
+}
+
+.chooseway .item1 {
+  margin-left: 31rpx;
+}
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.js
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.js
@@ -1,23 +1,26 @@
-// components/orderconfirm/ordershopinfo/ordershopinfo.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})
+// components/orderconfirm/ordershopinfo/ordershopinfo.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    title:String,
+    spec:String,
+    price:String,
+    img:String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.json
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.json
@@ -1,6 +1,6 @@
-{
-    "component": true,
-    "usingComponents": {
-
-    }
+{
+    "component": true,
+    "usingComponents": {
+
+    }
 }
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.scss
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.scss
@@ -1,42 +1,42 @@
-.shopinfo {
-    width: 690rpx;
-    height: 218rpx;
-    border-bottom: 2rpx solid #EAEAEA;
-    margin: 0 auto;
-    display: flex;
-    justify-content: center;
-    .pic {
-        width: 150rpx;
-        height: 163rpx;
-        background-color: #EAEAEA;
-        margin-right: 40rpx;
-    }
-    .right {
-        width: 402rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        margin-top: 6rpx;
-        .shopname {
-            font-size: 28rpx;
-            font-weight: bold;
-            line-height: 39rpx;
-        }
-        .down {
-            margin-bottom: 50rpx;
-            display: flex;
-            justify-content: space-between;
-            .shopdesc {
-                color: #666666;
-                font-size: 24rpx;
-                .size {
-                    margin-right: 20rpx;
-                }
-            }
-            .pri {
-                color: #E1C89F;
-                font-size: 28rpx;
-            }
-        }
-    }
+.shopinfo {
+    width: 690rpx;
+    height: 218rpx;
+    border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    display: flex;
+    justify-content: center;
+    .pic {
+        width: 150rpx;
+        height: 163rpx;
+        background-color: #EAEAEA;
+        margin-right: 40rpx;
+    }
+    .right {
+        width: 402rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        margin-top: 6rpx;
+        .shopname {
+            font-size: 28rpx;
+            font-weight: bold;
+            line-height: 39rpx;
+        }
+        .down {
+            margin-bottom: 50rpx;
+            display: flex;
+            justify-content: space-between;
+            .shopdesc {
+                color: #666666;
+                font-size: 24rpx;
+                .size {
+                    margin-right: 20rpx;
+                }
+            }
+            .pri {
+                color: #E1C89F;
+                font-size: 28rpx;
+            }
+        }
+    }
 }
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.wxml
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxml
@@ -1,13 +1,13 @@
-<view class="shopinfo">
-    <image class="pic"></image>
-    <view class="right">
-        <view class="shopname">产品产品产品产品产品产品产品产品产品产品产品产品产品</view>
-        <view class="down">
-            <view class="shopdesc">
-                <text class="size">规格10ml</text>
-                <text> 0.04kg</text>
-            </view>
-            <view class="pri">￥657</view>
-        </view>
-    </view>
+<view class="shopinfo">
+    <image class="pic" src="{{img}}"></image>
+    <view class="right">
+        <view class="shopname">{{title}}</view>
+        <view class="down">
+            <view class="shopdesc">
+                <text class="size">{{spec}}</text>
+                <!-- <text> 0.04kg</text> -->
+            </view>
+            <view class="pri">￥{{price}}</view>
+        </view>
+    </view>
 </view>
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.wxss
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxss
@@ -1,49 +1,49 @@
-.shopinfo {
-  width: 690rpx;
-  height: 218rpx;
-  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
-  display: flex;
-  justify-content: center;
-}
-
-.shopinfo .pic {
-  width: 150rpx;
-  height: 163rpx;
-  background-color: #EAEAEA;
-  margin-right: 40rpx;
-}
-
-.shopinfo .right {
-  width: 402rpx;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin-top: 6rpx;
-}
-
-.shopinfo .right .shopname {
-  font-size: 28rpx;
-  font-weight: bold;
-  line-height: 39rpx;
-}
-
-.shopinfo .right .down {
-  margin-bottom: 50rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.shopinfo .right .down .shopdesc {
-  color: #666666;
-  font-size: 24rpx;
-}
-
-.shopinfo .right .down .shopdesc .size {
-  margin-right: 20rpx;
-}
-
-.shopinfo .right .down .pri {
-  color: #E1C89F;
-  font-size: 28rpx;
-}
+.shopinfo {
+  width: 690rpx;
+  height: 218rpx;
+  border-bottom: 2rpx solid #EAEAEA;
+  margin: 0 auto;
+  display: flex;
+  justify-content: center;
+}
+
+.shopinfo .pic {
+  width: 150rpx;
+  height: 163rpx;
+  background-color: #EAEAEA;
+  margin-right: 40rpx;
+}
+
+.shopinfo .right {
+  width: 402rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-top: 6rpx;
+}
+
+.shopinfo .right .shopname {
+  font-size: 28rpx;
+  font-weight: bold;
+  line-height: 39rpx;
+}
+
+.shopinfo .right .down {
+  margin-bottom: 50rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.shopinfo .right .down .shopdesc {
+  color: #666666;
+  font-size: 24rpx;
+}
+
+.shopinfo .right .down .shopdesc .size {
+  margin-right: 20rpx;
+}
+
+.shopinfo .right .down .pri {
+  color: #E1C89F;
+  font-size: 28rpx;
+}
--- a/components/orderconfirm/orderyf/orderyf.js
+++ b/components/orderconfirm/orderyf/orderyf.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderyf/orderyf.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    price:String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
--- a/components/orderconfirm/orderyf/orderyf.json
+++ b/components/orderconfirm/orderyf/orderyf.json
@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }
--- a/components/orderconfirm/orderyf/orderyf.scss
+++ b/components/orderconfirm/orderyf/orderyf.scss
@@ -1,17 +1,17 @@
-.orderyf {
-    width: 690rpx;
-    height: 96rpx;
-    line-height: 96rpx;
-    display: flex;
-    border-bottom: 2rpx solid #EAEAEA;
-    margin: 0 auto;
-    justify-content: space-between;
-    font-size: 28rpx;
-    .left {
-        margin-left: 31rpx
-    }
-    .right {
-        margin-right: 20rpx;
-        ;
-    }
+.orderyf {
+    width: 690rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    display: flex;
+    border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    justify-content: space-between;
+    font-size: 28rpx;
+    .left {
+        margin-left: 31rpx
+    }
+    .right {
+        margin-right: 20rpx;
+        ;
+    }
 }
--- a/components/orderconfirm/orderyf/orderyf.wxml
+++ b/components/orderconfirm/orderyf/orderyf.wxml
@@ -1,4 +1,4 @@
-<view class="orderyf">
-    <view class="left">运费</view>
-    <view class="right">￥16</view>
+<view class="orderyf">
+    <view class="left">运费</view>
+    <view class="right">￥{{price}}</view>
 </view>
--- a/components/orderconfirm/orderyf/orderyf.wxss
+++ b/components/orderconfirm/orderyf/orderyf.wxss
@@ -1,18 +1,18 @@
-.orderyf {
-  width: 690rpx;
-  height: 96rpx;
-  line-height: 96rpx;
-  display: flex;
-  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
-  justify-content: space-between;
-  font-size: 28rpx;
-}
-
-.orderyf .left {
-  margin-left: 31rpx;
-}
-
-.orderyf .right {
-  margin-right: 20rpx;
-}
+.orderyf {
+  width: 690rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  display: flex;
+  border-bottom: 2rpx solid #EAEAEA;
+  margin: 0 auto;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+
+.orderyf .left {
+  margin-left: 31rpx;
+}
+
+.orderyf .right {
+  margin-right: 20rpx;
+}