玩啥那

README.md

@@ -70,3 +70,5 @@
 - pages/member/member 会员商品 <br>
     - member/membertop 会员商品顶部的字
     - member/membershop  单个商品
+- pages/deposit/deposit 提现
+- pages/commission/commission 当前佣金

app.json

@@ -1,6 +1,8 @@
 {
     "pages": [
         "pages/index/index",
+        "pages/share/share",
+        "pages/commission/commission",
         "pages/login/login",
         "pages/search/search",
         "pages/shopping/shopping",
@@ -20,11 +22,11 @@
         "pages/sales1/sales1",
         "pages/sales2/sales2",
         "pages/member/member",
+        "pages/deposit/deposit",
         "pages/yue/yue",
 
-        "pages/yongjin/yongjin",
+        "pages/yongjin/yongjin"
 
-        "pages/share/share"
     ],
     "window": {
         "backgroundTextStyle": "light",
@@ -35,16 +37,27 @@
     "tabBar": {
         "list": [{
             "pagePath": "pages/index/index",
-            "text": "首页"
+            "text": "首页",
+            "iconPath":"/utils/img/index.png",
+            "selectedIconPath":"/utils/img/indexs.png"
         }, {
             "pagePath": "pages/classify/classify",
-            "text": "分类"
+            "text": "分类",
+            "iconPath":"/utils/img/classify.png",
+            "selectedIconPath":"/utils/img/classifys.png"
+
         }, {
             "pagePath": "pages/shopping/shopping",
-            "text": "购物车"
+            "text": "购物车",
+            "iconPath":"/utils/img/shopping.png",
+            "selectedIconPath":"/utils/img/shoppings.png"
+
         }, {
             "pagePath": "pages/personal/personal",
-            "text": "我的"
+            "text": "我的",
+            "iconPath":"/utils/img/personal.png",
+            "selectedIconPath":"/utils/img/personals.png"
+
         }]
     },
     "style": "v2",

app.wxss

@@ -1,357 +1,356 @@
-
+
-
+
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
-
+
-/* Document
+/* Document
-   ========================================================================== */
+   ========================================================================== */
-
+
-/**
+/**
- * 1. Correct the line height in all browsers.
+ * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
+ */
-
+
-html {
+ .towline {
-  line-height: 1; /* 1 */
+  overflow: hidden;
-  -webkit-text-size-adjust: 100%; /* 2 */
+
-}
+  text-overflow: ellipsis;
-
+
-/* Sections
+  display: -webkit-box;
-   ========================================================================== */
+
-
+  -webkit-box-orient: vertical;
-/**
+
- * Remove the margin in all browsers.
+  -webkit-line-clamp: 2;
- */
+}
-
+html {
-body {
+  line-height: 1; /* 1 */
-  margin: 0;
+  -webkit-text-size-adjust: 100%; /* 2 */
-}
+}
-
+
-/**
+/* Sections
- * Render the `main` element consistently in IE.
+   ========================================================================== */
- */
+
-
+/**
-main {
+ * Remove the margin in all browsers.
-  display: block;
+ */
-}
+
-
+body {
-/**
+  margin: 0;
- * Correct the font size and margin on `h1` elements within `section` and
+}
- * `article` contexts in Chrome, Firefox, and Safari.
+
- */
+/**
-
+ * Render the `main` element consistently in IE.
-h1 {
+ */
-  font-size: 2em;
+
-  margin: 0.67em 0;
+main {
-}
+  display: block;
-
+}
-/* Grouping content
+
-   ========================================================================== */
+/**
-
+ * Correct the font size and margin on `h1` elements within `section` and
-/**
+ * `article` contexts in Chrome, Firefox, and Safari.
- * 1. Add the correct box sizing in Firefox.
+ */
- * 2. Show the overflow in Edge and IE.
+
- */
+h1 {
-
+  font-size: 2em;
-hr {
+  margin: 0.67em 0;
-  box-sizing: content-box; /* 1 */
+}
-  height: 0; /* 1 */
+
-  overflow: visible; /* 2 */
+/* Grouping content
-}
+   ========================================================================== */
-
+
-/**
+/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 1. Add the correct box sizing in Firefox.
- * 2. Correct the odd `em` font sizing in all browsers.
+ * 2. Show the overflow in Edge and IE.
- */
+ */
-
+
-pre {
+hr {
-  font-family: monospace, monospace; /* 1 */
+  box-sizing: content-box; /* 1 */
-  font-size: 1em; /* 2 */
+  height: 0; /* 1 */
-}
+  overflow: visible; /* 2 */
-
+}
-/* Text-level semantics
+
-   ========================================================================== */
+/**
-
+ * 1. Correct the inheritance and scaling of font size in all browsers.
-/**
+ * 2. Correct the odd `em` font sizing in all browsers.
- * Remove the gray background on active links in IE 10.
+ */
- */
+
-
+pre {
-a {
+  font-family: monospace, monospace; /* 1 */
-  background-color: transparent;
+  font-size: 1em; /* 2 */
-}
+}
-
+
-/**
+/* Text-level semantics
- * 1. Remove the bottom border in Chrome 57-
+   ========================================================================== */
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+
- */
+/**
-
+ * Remove the gray background on active links in IE 10.
-abbr[title] {
+ */
-  border-bottom: none; /* 1 */
+
-  text-decoration: underline; /* 2 */
+a {
-  text-decoration: underline dotted; /* 2 */
+  background-color: transparent;
-}
+}
-
+
-/**
+/**
- * Add the correct font weight in Chrome, Edge, and Safari.
+ * 1. Remove the bottom border in Chrome 57-
- */
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
-
+ */
-b,
+
-strong {
+abbr[title] {
-  font-weight: bolder;
+  border-bottom: none; /* 1 */
-}
+  text-decoration: underline; /* 2 */
-
+  text-decoration: underline dotted; /* 2 */
-/**
+}
- * 1. Correct the inheritance and scaling of font size in all browsers.
+
- * 2. Correct the odd `em` font sizing in all browsers.
+/**
- */
+ * Add the correct font weight in Chrome, Edge, and Safari.
-
+ */
-code,
+
-kbd,
+b,
-samp {
+strong {
-  font-family: monospace, monospace; /* 1 */
+  font-weight: bolder;
-  font-size: 1em; /* 2 */
+}
-}
+
-
+/**
-/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
- * Add the correct font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
- */
+ */
-
+
-small {
+code,
-  font-size: 80%;
+kbd,
-}
+samp {
-
+  font-family: monospace, monospace; /* 1 */
-/**
+  font-size: 1em; /* 2 */
- * Prevent `sub` and `sup` elements from affecting the line height in
+}
- * all browsers.
+
- */
+/**
-
+ * Add the correct font size in all browsers.
-sub,
+ */
-sup {
+
-  font-size: 75%;
+small {
-  line-height: 0;
+  font-size: 80%;
-  position: relative;
+}
-  vertical-align: baseline;
+
-}
+/**
-
+ * Prevent `sub` and `sup` elements from affecting the line height in
-sub {
+ * all browsers.
-  bottom: -0.25em;
+ */
-}
+
-
+sub,
-sup {
+sup {
-  top: -0.5em;
+  font-size: 75%;
-}
+  line-height: 0;
-
+  position: relative;
-/* Embedded content
+  vertical-align: baseline;
-   ========================================================================== */
+}
-
+
-/**
+sub {
- * Remove the border on images inside links in IE 10.
+  bottom: -0.25em;
- */
+}
-
+
-img {
+sup {
-  border-style: none;
+  top: -0.5em;
-}
+}
-
+
-/* Forms
+/* Embedded content
-   ========================================================================== */
+   ========================================================================== */
-
+
-/**
+/**
- * 1. Change the font styles in all browsers.
+ * Remove the border on images inside links in IE 10.
- * 2. Remove the margin in Firefox and Safari.
+ */
- */
+
-
+img {
-button,
+  border-style: none;
-input,
+}
-optgroup,
+
-select,
+/* Forms
-textarea {
+   ========================================================================== */
-  font-family: inherit; /* 1 */
+
-  font-size: 100%; /* 1 */
+/**
-  line-height: 1; /* 1 */
+ * 1. Change the font styles in all browsers.
-  margin: 0; /* 2 */
+ * 2. Remove the margin in Firefox and Safari.
-}
+ */
-
+
-/**
+input,
- * Show the overflow in IE.
+optgroup,
- * 1. Show the overflow in Edge.
+select,
- */
+textarea {
-
+  font-family: inherit; /* 1 */
-button,
+  font-size: 100%; /* 1 */
-input {
+  line-height: 1; /* 1 */
-  /* 1 */
+  margin: 0; /* 2 */
-  overflow: visible;
+}
-}
+
-
+/**
-/**
+ * Show the overflow in IE.
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Show the overflow in Edge.
- * 1. Remove the inheritance of text transform in Firefox.
+ */
- */
+
-
+input {
-button,
+  /* 1 */
-select {
+  overflow: visible;
-  /* 1 */
+}
-  text-transform: none;
+
-}
+/**
-
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
-/**
+ * 1. Remove the inheritance of text transform in Firefox.
- * Correct the inability to style clickable types in iOS and Safari.
+ */
- */
+
-
+select {
-button,
+  /* 1 */
-[type="button"],
+  text-transform: none;
-[type="reset"],
+}
-[type="submit"] {
+
-  -webkit-appearance: button;
+/**
-}
+ * Correct the inability to style clickable types in iOS and Safari.
-
+ */
-/**
+
- * Remove the inner border and padding in Firefox.
+/**
- */
+ * Remove the inner border and padding in Firefox.
-
+ */
-button::-moz-focus-inner,
+
-[type="button"]::-moz-focus-inner,
+
-[type="reset"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
+[type="submit"]::-moz-focus-inner {
-  border-style: none;
+  border-style: none;
-  padding: 0;
+  padding: 0;
-}
+}
-
+
-/**
+/**
- * Restore the focus styles unset by the previous rule.
+ * Restore the focus styles unset by the previous rule.
- */
+ */
-
+
-button:-moz-focusring,
+
-[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
-[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
-  outline: 1px dotted ButtonText;
+}
-}
+
-
+/**
-/**
+ * Correct the padding in Firefox.
- * Correct the padding in Firefox.
+ */
- */
+
-
+fieldset {
-fieldset {
+  padding: 0.35em 0.75em 0.625em;
-  padding: 0.35em 0.75em 0.625em;
+}
-}
+
-
+/**
-/**
+ * 1. Correct the text wrapping in Edge and IE.
- * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
- * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
- *    `fieldset` elements in all browsers.
+ */
- */
+
-
+legend {
-legend {
+  box-sizing: border-box; /* 1 */
-  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
-  color: inherit; /* 2 */
+  display: table; /* 1 */
-  display: table; /* 1 */
+  max-width: 100%; /* 1 */
-  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
-  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
-  white-space: normal; /* 1 */
+}
-}
+
-
+/**
-/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
- */
+
-
+progress {
-progress {
+  vertical-align: baseline;
-  vertical-align: baseline;
+}
-}
+
-
+/**
-/**
+ * Remove the default vertical scrollbar in IE 10+.
- * Remove the default vertical scrollbar in IE 10+.
+ */
- */
+
-
+textarea {
-textarea {
+  overflow: auto;
-  overflow: auto;
+}
-}
+
-
+/**
-/**
+ * 1. Add the correct box sizing in IE 10.
- * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
- * 2. Remove the padding in IE 10.
+ */
- */
+
-
+[type="checkbox"],
-[type="checkbox"],
+[type="radio"] {
-[type="radio"] {
+  box-sizing: border-box; /* 1 */
-  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
-  padding: 0; /* 2 */
+}
-}
+
-
+/**
-/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
- * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
- */
+
-
+[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
-[type="number"]::-webkit-outer-spin-button {
+  height: auto;
-  height: auto;
+}
-}
+
-
+/**
-/**
+ * 1. Correct the odd appearance in Chrome and Safari.
- * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
- * 2. Correct the outline style in Safari.
+ */
- */
+
-
+[type="search"] {
-[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
-  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
-  outline-offset: -2px; /* 2 */
+}
-}
+
-
+/**
-/**
+ * Remove the inner padding in Chrome and Safari on macOS.
- * Remove the inner padding in Chrome and Safari on macOS.
+ */
- */
+
-
+[type="search"]::-webkit-search-decoration {
-[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
-  -webkit-appearance: none;
+}
-}
+
-
+/**
-/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
- * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
- * 2. Change font properties to `inherit` in Safari.
+ */
- */
+
-
+::-webkit-file-upload-button {
-::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
-  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
-  font: inherit; /* 2 */
+}
-}
+
-
+/* Interactive
-/* Interactive
+   ========================================================================== */
-   ========================================================================== */
+
-
+/*
-/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
- * Add the correct display in Edge, IE 10+, and Firefox.
+ */
- */
+
-
+details {
-details {
+  display: block;
-  display: block;
+}
-}
+
-
+/*
-/*
+ * Add the correct display in all browsers.
- * Add the correct display in all browsers.
+ */
- */
+
-
+summary {
-summary {
+  display: list-item;
-  display: list-item;
+}
-}
+
-
+/* Misc
-/* Misc
+   ========================================================================== */
-   ========================================================================== */
+
-
+/**
-/**
+ * Add the correct display in IE 10+.
- * Add the correct display in IE 10+.
+ */
- */
+
-
+template {
-template {
+  display: none;
-  display: none;
+}
-}
+
-
+/**
-/**
+ * Add the correct display in IE 10.
- * Add the correct display in IE 10.
+ */
- */
+
-
+[hidden] {
-[hidden] {
+  display: none;
-  display: none;
+}
-}
+image {
-image {
+  background-size: cover;
-  background-size: cover;
+  /* background-image: url("http://luyuan.tk/static/images/TIM%E5%9B%BE%E7%89%8720191214113605.jpg"); */
-  background-image: url("http://luyuan.tk/static/images/TIM%E5%9B%BE%E7%89%8720191214113605.jpg");
+}
-}

components/addaddress/shuru/shuru.js

@@ -1,31 +1,31 @@
-// components/addaddress/shuru/shuru.js
+// components/addaddress/shuru/shuru.js
-Component({
+Component({
-    /**
+    /**
-     * 组件的属性列表
+     * 组件的属性列表
-     */
+     */
-    properties: {
+    properties: {
-        left: String,
+        left: String,
-        right: String,
+        right: String,
-        ifarrow: Boolean,
+        ifarrow: Boolean,
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的初始数据
+     * 组件的初始数据
-     */
+     */
-    data: {
+    data: {
-
+
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的方法列表
+     * 组件的方法列表
-     */
+     */
-    methods: {
+    methods: {
-        get(e){
+        get(e){
-            // console.log(e)
+            // console.log(e)
-            this.triggerEvent('myevent', e.detail.value)
+            this.triggerEvent('myevent', e.detail.value)
-        },
+        },
-        choose(e){
+        choose(e){
-            
+            
-        }
+        }
-    }   
+    }   
 })

components/addaddress/shuru/shuru.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/addaddress/shuru/shuru.scss

@@ -25,11 +25,10 @@
             color: #333333;
         }
         .arrow {
-            width: 14rpx;
+            width: 21rpx;
             height: 25rpx;
-            background-color: #999999;
             margin: auto 0;
-            margin-left: 27rpx;
+            margin-left: 20rpx;
         }
     }
 }

components/addaddress/shuru/shuru.wxml

@@ -2,7 +2,7 @@
     <view class="left">{{left}}</view>
     <view class="right"wx:if="{{ifarrow}}" bindtap="choose">
         <text class="shurupla1">{{right}}</text>
-        <view class="arrow"></view>
+        <image class="arrow" src="../../../utils/img/right.png"></image>
     </view>
     <view class="right" wx:else>
         <input type="text" placeholder-class="shurupla" class="shuru1" placeholder="{{right}}" value="" bindinput="get" no="0" data-left="{{left}}"/>

components/addaddress/shuru/shuru.wxss

@@ -1,41 +1 @@
-.shuru {
+.shuru{width:670rpx;height:100rpx;border-bottom:2rpx solid #E8E8E8;margin:0 auto;display:flex;justify-content:space-between;line-height:100rpx;font-size:28rpx}.shuru .left{color:#333333}.shuru .right{margin:auto 0;display:flex}.shuru .right .shuru1{width:280rpx;text-align:right}.shuru .right .shurupla{color:#999999;font-size:28rpx}.shuru .right .shurupla1{color:#333333}.shuru .right .arrow{width:21rpx;height:25rpx;margin:auto 0;margin-left:20rpx}
-  width: 670rpx;
-  height: 100rpx;
-  border-bottom: 2rpx solid #E8E8E8;
-  margin: 0 auto;
-  display: flex;
-  justify-content: space-between;
-  line-height: 100rpx;
-  font-size: 28rpx;
-}
-
-.shuru .left {
-  color: #333333;
-}
-
-.shuru .right {
-  margin: auto 0;
-  display: flex;
-}
-
-.shuru .right .shuru1 {
-  width: 280rpx;
-  text-align: right;
-}
-
-.shuru .right .shurupla {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.shuru .right .shurupla1 {
-  color: #333333;
-}
-
-.shuru .right .arrow {
-  width: 14rpx;
-  height: 25rpx;
-  background-color: #999999;
-  margin: auto 0;
-  margin-left: 27rpx;
-}

components/chooseaddr/addradd/addradd.js

@@ -1,23 +1,23 @@
-// components/chooseaddr/addradd/addradd.js
+// components/chooseaddr/addradd/addradd.js
-Component({
+Component({
-    /**
+    /**
-     * 组件的属性列表
+     * 组件的属性列表
-     */
+     */
-    properties: {
+    properties: {
-        text: String
+        text: String
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的初始数据
+     * 组件的初始数据
-     */
+     */
-    data: {
+    data: {
-
+
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的方法列表
+     * 组件的方法列表
-     */
+     */
-    methods: {
+    methods: {
-
+
-    }
+    }
 })

components/chooseaddr/addradd/addradd.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/chooseaddr/address/address.js

@@ -1,35 +1,35 @@
-// components/chooseaddr/address/address.js
+// components/chooseaddr/address/address.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-    username:String,
+    username:String,
-    tel:String,
+    tel:String,
-    address:String,
+    address:String,
-    isdefault:String,
+    isdefault:String,
-    youzheng:String,
+    youzheng:String,
-    addressid:String
+    addressid:String
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的初始数据
+   * 组件的初始数据
-   */
+   */
-  data: {
+  data: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的方法列表
+   * 组件的方法列表
-   */
+   */
-  methods: {
+  methods: {
-    del(){
+    del(){
-      // console.log("del")
+      // console.log("del")
-      this.triggerEvent('delete')
+      this.triggerEvent('delete')
-    },
+    },
-    setdefault(){
+    setdefault(){
-      this.triggerEvent('default',this.data.addressid)
+      this.triggerEvent('default',this.data.addressid)
-    }
+    }
-  }
+  }
-})
+})

components/chooseaddr/address/address.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/chooseaddr/address/address.scss

@@ -8,7 +8,7 @@
     ;
     .left {
         width: 576rpx;
-        height: 119rpx;
+        // height: 119rpx;
         .userinfo {
             color: #333333;
             font-size: 26rpx;
@@ -35,6 +35,7 @@
             text-indent: 30rpx;
             margin-top: 32rpx;
             width: 551rpx;
+            height: 50rpx;
             margin-left: 20rpx;
             // display: flex;
             .select {
@@ -59,7 +60,7 @@
             }
             .path {
                 // float: left;
-                line-height: 25rpx;
+                // line-height: 25rpx;
             }
         }
     }

components/chooseaddr/address/address.wxml

@@ -1,30 +1,30 @@
-<view class="address">
+<view class="address">
-    <view class="left">
+    <view class="left">
-        <view class="userinfo">
+        <view class="userinfo">
-            <view class="username">
+            <view class="username">
-                <view class="username1">{{username}}</view>
+                <view class="username1">{{username}}</view>
-                <view class="tel">{{tel}}</view>
+                <view class="tel">{{tel}}</view>
-                  
+                  
-            </view>
+            </view>
-            <view>邮政编码：{{youzheng}}</view>
+            <view>邮政编码：{{youzheng}}</view>
-        </view>
+        </view>
-        <view class="addr" wx:if="{{isdefault=='1'}}">
+        <view class="addr" wx:if="{{isdefault=='1'}}" bindtap="setdefault">
-            <view class="select selected" bindtap="setdefault"></view>
+            <view class="select selected"></view>
-            <!-- <view class="default"></view> -->
+            <!-- <view class="default"></view> -->
-            <view class="path">
+            <view class="path">
-            <text>默认</text>   
+            <text>默认</text>   
-            {{address}}
+            {{address}}
-            </view>
+            </view>
-        </view>
+        </view>
-        <view class="addr" wx:else>
+        <view  bindtap="setdefault" class="addr" wx:else>
-            <view class="select" bindtap="setdefault"></view>
+            <view class="select"></view>
-            <!-- <view class="default"></view> -->
+            <!-- <view class="default"></view> -->
-            <view class="path">
+            <view class="path">
-            <text>设为默认</text>   
+            <text>设为默认</text>   
-            {{address}}
+            {{address}}
-            </view>
+            </view>
-        </view>
+        </view>
-    </view>
+    </view>
-    <view class="line"></view>
+    <view class="line"></view>
-    <view class="right" bindtap="del">删除</view>
+    <view class="right" bindtap="del">删除</view>
 </view>

components/chooseaddr/address/address.wxss

@@ -1,85 +1 @@
-.address {
+.address{width:690rpx;height:192rpx;border-bottom:2rpx solid #EAEAEA;display:flex;justify-content:space-between;padding-bottom:27rpx}.address .left{width:576rpx}.address .left .userinfo{color:#333333;font-size:26rpx;text-indent:16xrpx;margin-top:41rpx;display:flex;justify-content:space-between}.address .left .userinfo .username{display:flex;flex-wrap:nowrap}.address .left .userinfo .username .username1{width:140rpx;overflow:hidden}.address .left .userinfo .username .tel{margin-right:6rpx}.address .left .addr{color:#999999;font-size:24rpx;text-indent:30rpx;margin-top:32rpx;width:551rpx;height:50rpx;margin-left:20rpx}.address .left .addr .select{width:26rpx;height:26rpx;margin:auto 0;border-radius:50%;background-color:#EAEAEA;float:left;margin-right:-14rpx}.address .left .addr .selected{background-color:#47C877}.address .left .addr .default{font-size:24rpx;text-indent:16rpx;line-height:60rpx;float:left}.address .line{width:2rpx;height:75rpx;background:#d3d3d3;margin:auto 0}.address .right{color:#666666;font-size:24rpx;line-height:192rpx;margin-left:30rpx;margin-right:21rpx}
-  width: 690rpx;
-  height: 192rpx;
-  border-bottom: 2rpx solid #EAEAEA;
-  display: flex;
-  justify-content: space-between;
-  padding-bottom: 27rpx;
-}
-
-.address .left {
-  width: 576rpx;
-  height: 119rpx;
-}
-
-.address .left .userinfo {
-  color: #333333;
-  font-size: 26rpx;
-  text-indent: 16xrpx;
-  margin-top: 41rpx;
-  display: flex;
-  justify-content: space-between;
-}
-
-.address .left .userinfo .username {
-  display: flex;
-  flex-wrap: nowrap;
-}
-
-.address .left .userinfo .username .username1 {
-  width: 140rpx;
-  overflow: hidden;
-}
-
-.address .left .userinfo .username .tel {
-  margin-right: 6rpx;
-}
-
-.address .left .addr {
-  color: #999999;
-  font-size: 24rpx;
-  text-indent: 30rpx;
-  margin-top: 32rpx;
-  width: 551rpx;
-  margin-left: 20rpx;
-}
-
-.address .left .addr .select {
-  width: 26rpx;
-  height: 26rpx;
-  margin: auto 0;
-  border-radius: 50%;
-  background-color: #EAEAEA;
-  float: left;
-  margin-right: -14rpx;
-}
-
-.address .left .addr .selected {
-  background-color: #47C877;
-}
-
-.address .left .addr .default {
-  font-size: 24rpx;
-  text-indent: 16rpx;
-  line-height: 60rpx;
-  float: left;
-}
-
-.address .left .addr .path {
-  line-height: 25rpx;
-}
-
-.address .line {
-  width: 2rpx;
-  height: 75rpx;
-  background: lightgray;
-  margin: auto 0;
-}
-
-.address .right {
-  color: #666666;
-  font-size: 24rpx;
-  line-height: 192rpx;
-  margin-left: 30rpx;
-  margin-right: 21rpx;
-}

components/classify/list/index.scss

@@ -48,13 +48,20 @@
           display: flex;
           align-items: center;
           justify-content: space-between;
-          > text:first-child {
+          > view:first-child {
-            font-size: 30rpx;
+            // font-size: 30rpx;
             color: #dec499;
           }
-          > text:last-child {
+          // > text:last-child {
+          //   font-size: 22rpx;
+          //   color: #999;
+          // }
+          > view {
             font-size: 22rpx;
             color: #999;
+            >text{
+              font-size: 20rpx;
+            }
           }
         }
       }

components/classify/list/index.wxml

@@ -5,8 +5,8 @@
                 <view class="introduce">
                     <text class="towline">{{item.goods_name}}</text>
                     <view>
-                        <text>￥{{item.shop_price}}</text>
+                        <view>€{{item.shop_price_eur}}<text>(￥{{item.shop_price}})</text></view>
-                        <text>加入购物车</text>
+                        <view>加入购物车</view>
                     </view>
                 </view>
             </view>

components/classify/list/index.wxss

@@ -1 +1 @@
-.list{padding-left:20rpx;width:572rpx;box-sizing:border-box;height:100vh}.list .commodity{width:552rpx;display:flex;align-items:center}.list .commodity .content{width:552rpx;height:100%;display:flex;align-items:center;border-bottom:2rpx solid #eaeaea;padding:30rpx 0}.list .commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.list .commodity .content .introduce{width:336rpx;margin-left:40rpx;display:flex;flex-direction:column}.list .commodity .content .introduce .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.list .commodity .content .introduce>text{font-size:22rpx;color:#333;margin-bottom:22rpx}.list .commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.list .commodity .content .introduce>view>text:first-child{font-size:30rpx;color:#dec499}.list .commodity .content .introduce>view>text:last-child{font-size:22rpx;color:#999}
+.list{padding-left:20rpx;width:572rpx;box-sizing:border-box;height:100vh}.list .commodity{width:552rpx;display:flex;align-items:center}.list .commodity .content{width:552rpx;height:100%;display:flex;align-items:center;border-bottom:2rpx solid #eaeaea;padding:30rpx 0}.list .commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.list .commodity .content .introduce{width:336rpx;margin-left:40rpx;display:flex;flex-direction:column}.list .commodity .content .introduce .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.list .commodity .content .introduce>text{font-size:22rpx;color:#333;margin-bottom:22rpx}.list .commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.list .commodity .content .introduce>view>view:first-child{color:#dec499}.list .commodity .content .introduce>view>view{font-size:22rpx;color:#999}.list .commodity .content .introduce>view>view>text{font-size:20rpx}

components/classify/navigation/index.js

@@ -1,16 +1,17 @@
 Component({
     properties: {
-        types: Array
+        types: Array,
+        ids: Number
+
     },
     data: {
-        id: 0
     },
     methods: {
         select(a) {
             // console.log(this.data.a.target.dataset.id)
             // console.log(a.target.dataset.id)
             this.setData({
-                id: a.target.dataset.id
+                ids: a.target.dataset.id
             })
             this.triggerEvent("select",{id:a.target.dataset.id})
         }

components/classify/navigation/index.scss

@@ -8,7 +8,7 @@
         font-size: 28rpx;
         color: #333;
         border-bottom: 2rpx solid #eaeaea;
-        line-height: 97rpx;
+        line-height: 95rpx;
         font-weight: bold;
         text-align: center;
         box-sizing: border-box;

components/classify/navigation/index.wxml

@@ -1,5 +1,6 @@
     <scroll-view class="navigation" scroll-y="{{true}}" bind:tap="select" >
-      <view wx:for="{{types}}" data-id="{{index}}" class="{{id == index?'on' : ''}}">{{item.name}}</view>
+      <!-- {{ids}} -->
+      <view wx:for="{{types}}" data-id="{{item.id}}" class="{{ids == item.id?'on' : ''}}">{{item.name}}</view>
         <!-- <view data-id="0" class="{{id == 0?'on' : ''}}">热门商品</view>
         <view data-id="1" class="{{id == 1?'on' : ''}}">美容健身</view>
         <view data-id="2" class="{{id == 2?'on' : ''}}">美容健身</view>

components/classify/navigation/index.wxss

@@ -1 +1 @@
-.navigation{width:188rpx;border-right:2rpx solid #eaeaea;max-height:100vh}.navigation view{height:97rpx;font-size:28rpx;color:#333;border-bottom:2rpx solid #eaeaea;line-height:97rpx;font-weight:bold;text-align:center;box-sizing:border-box}.navigation .on{border-left:5rpx solid #56CC84;color:#56CC84}
+.navigation{width:188rpx;border-right:2rpx solid #eaeaea;max-height:100vh}.navigation view{height:97rpx;font-size:28rpx;color:#333;border-bottom:2rpx solid #eaeaea;line-height:95rpx;font-weight:bold;text-align:center;box-sizing:border-box}.navigation .on{border-left:5rpx solid #56CC84;color:#56CC84}

components/index/list/commodity/index.js

@@ -4,7 +4,8 @@ Component({
         title:String,
         id:String,
         price:String,
-        shopid:String
+        shopid:String,
+        shoppriceeur:String
     },
     data: {},
     methods: {

components/index/list/commodity/index.scss

@@ -39,13 +39,20 @@
         display: flex;
         align-items: center;
         justify-content: space-between;
-        > text:first-child {
+        > view:first-child {
-          font-size: 30rpx;
+          // font-size: 30rpx;
           color: #dec499;
         }
-        > text:last-child {
+        // > text:last-child {
+        //   font-size: 22rpx;
+        //   color: #999;
+        // }
+        > view {
           font-size: 22rpx;
           color: #999;
+          >text{
+            font-size: 20rpx;
+          }
         }
       }
     }

components/index/list/commodity/index.wxml

@@ -5,8 +5,8 @@
                     <text class="towline">{{title}}</text>
                   
                     <view>
-                        <text>￥{{price}}</text>
+                        <view>€{{shoppriceeur}}<text>(￥{{price}})</text></view>
-                        <text>加入购物车</text>
+                        <view>加入购物车</view>
                     </view>
                 </view>
             </view>

components/index/list/commodity/index.wxss

@@ -1 +1 @@
-.commodity{width:623rpx;height:143rpx;margin-top:32rpx;display:flex;align-items:center}.commodity .content{width:614rpx;height:100%;display:flex;align-items:center;box-shadow:0 0 24rpx 0 rgba(227,227,227,0.4)}.commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.commodity .content .introduce{width:410rpx;margin-left:40rpx;display:flex;flex-direction:column}.commodity .content .introduce>text{font-size:26rpx;color:#333;margin-bottom:22rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.commodity .content .introduce>view>text:first-child{font-size:30rpx;color:#dec499}.commodity .content .introduce>view>text:last-child{font-size:22rpx;color:#999}.commodity .decorate{width:9rpx;height:102rpx;background-color:#3fb66e}
+.commodity{width:623rpx;height:143rpx;margin-top:32rpx;display:flex;align-items:center}.commodity .content{width:614rpx;height:100%;display:flex;align-items:center;box-shadow:0 0 24rpx 0 rgba(227,227,227,0.4)}.commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.commodity .content .introduce{width:410rpx;margin-left:40rpx;display:flex;flex-direction:column}.commodity .content .introduce>text{font-size:26rpx;color:#333;margin-bottom:22rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.commodity .content .introduce>view>view:first-child{color:#dec499}.commodity .content .introduce>view>view{font-size:22rpx;color:#999}.commodity .content .introduce>view>view>text{font-size:20rpx}.commodity .decorate{width:9rpx;height:102rpx;background-color:#3fb66e}

components/index/list/index.js

@@ -1,6 +1,7 @@
 Component({
     properties: {
-      list:Array
+      list:Array,
+      huilv:String
     },
     data: {
     },

components/index/list/index.scss

@@ -1,12 +1,18 @@
 .list {
-    width: 623rpx;
+  width: 623rpx;
-    margin-top: 36rpx;
+  margin-top: 36rpx;
-    .title {
+  .title {
-      font-size: 30rpx;
+    font-size: 30rpx;
-      color: #333;
+    color: #333;
-      font-weight: bold;
+    font-weight: bold;
-      margin-left: 32rpx;
+    margin-left: 32rpx;
     //   margin-bottom: 32rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    > text:last-child {
+      font-size: 24rpx;
+      color: #666;
     }
-    
+  }
-  }
+}

components/index/list/index.wxml

@@ -1,4 +1,7 @@
- <view class="list">
+<view class="list">
-        <text class="title">热门商品</text>
+    <view class="title">
-        <commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}"></commodity>
+        <text>热门商品</text>
-    </view>
+        <text>实时汇率：€1=￥{{huilv}}</text>
+    </view>
+    <commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}" shoppriceeur="{{item.shop_price_eur}}"></commodity>
+</view>

components/index/list/index.wxss

@@ -1 +1 @@
-.list{width:623rpx;margin-top:36rpx}.list .title{font-size:30rpx;color:#333;font-weight:bold;margin-left:32rpx}
+.list{width:623rpx;margin-top:36rpx}.list .title{font-size:30rpx;color:#333;font-weight:bold;margin-left:32rpx;display:flex;align-items:center;justify-content:space-between}.list .title>text:last-child{font-size:24rpx;color:#666}

components/index/search/index.js

@@ -4,5 +4,11 @@ Component({
     data: {
     },
     methods: {
+      search(a){
+        console.log(a)
+        wx.navigateTo({
+          url:"/pages/search/search?key=" + a.detail.value
+        })
+      }
     }
   })

components/index/search/index.scss

@@ -9,7 +9,7 @@
     >image{
         width: 42rpx;
         height: 42rpx;
-        background-color: #000;
+        // background-color: #000;
         margin-left: 40rpx;
         margin-top: 17rpx;
     }

components/index/search/index.wxml

@@ -1,4 +1,4 @@
 <view class="search">
-    <image></image>
+    <image src="../../../utils/img/search.png"></image>
-    <input type="text" placeholder="输入您要搜索的产品" />
+    <input type="text" confirm-type="search " bindconfirm="search" placeholder="输入您要搜索的产品" />
 </view>

components/index/search/index.wxss

@@ -1 +1 @@
-.search{width:613rpx;height:76rpx;margin-top:30rpx;box-sizing:border-box;border-radius:15rpx;display:flex;border:1rpx solid #c6c6c6}.search>image{width:42rpx;height:42rpx;background-color:#000;margin-left:40rpx;margin-top:17rpx}.search>input{height:30rpx;width:480rpx;margin-top:20rpx;margin-left:17rpx;font-size:30rpx}
+.search{width:613rpx;height:76rpx;margin-top:30rpx;box-sizing:border-box;border-radius:15rpx;display:flex;border:1rpx solid #c6c6c6}.search>image{width:42rpx;height:42rpx;margin-left:40rpx;margin-top:17rpx}.search>input{height:30rpx;width:480rpx;margin-top:20rpx;margin-left:17rpx;font-size:30rpx}

components/member/membershop/membershop.js

@@ -1,23 +1,35 @@
-// components/member/membershop/membershop.js
+// components/member/membershop/membershop.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+    img: String,
-  },
+    name: String,
-
+    price: String,
-  /**
+    oprice: String,
-   * 组件的初始数据
+    gid:String
-   */
+  },
-  data: {
+
-
+  /**
-  },
+   * 组件的初始数据
-
+   */
-  /**
+  data: {
-   * 组件的方法列表
+
-   */
+  },
-  methods: {
+
-
+  /**
-  }
+   * 组件的方法列表
-})
+   */
+  methods: {
+nav(){
+  console.log(this.data.gid)
+  wx.navigateTo({
+    url:"/pages/product/product?shopid=" + this.data.gid,
+    fail(a){
+      console.log(a)
+    }
+  })
+}
+  }
+})

components/member/membershop/membershop.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/member/membershop/membershop.scss

@@ -3,13 +3,13 @@
     height: 557rpx;
     background-color: #FBFBFB;
     .pic {
-        width: 113rpx;
+        width: 256rpx;
         height: 256rpx;
         background-color: white;
         margin: 0 auto;
         position: relative;
         top: 64rpx;
-        left: 121rpx;
+        left: 64rpx;
     }
     .shopname {
         width: 273rpx;
@@ -26,5 +26,19 @@
         text-align: center;
         font-size: 30rpx;
         color: #09BB07;
+        >view:last-child{
+            font-size: 24rpx;
+        }
     }
+    .towline {
+        overflow: hidden;
+      
+        text-overflow: ellipsis;
+      
+        display: -webkit-box;
+      
+        -webkit-box-orient: vertical;
+      
+        -webkit-line-clamp: 2;
+      }
 }

components/member/membershop/membershop.wxml

@@ -1,6 +1,5 @@
-<view class="membershop">
+<view class="membershop" bind:tap="nav">
-    <image class="pic"></image>
+    <image class="pic" src="{{img}}"></image>
-    <view class="shopname">产品名产品名产品名
+    <view class="shopname towline">{{name}}</view>
-产品名产品名</view>
+<view class="pri"><view>€{{oprice}}</view><view>￥{{price}}</view></view>
-<view class="pri">$123</view>
 </view>

components/member/membershop/membershop.wxss

@@ -1,33 +1 @@
-.membershop {
+.membershop{width:373rpx;height:557rpx;background-color:#FBFBFB}.membershop .pic{width:256rpx;height:256rpx;background-color:white;margin:0 auto;position:relative;top:64rpx;left:64rpx}.membershop .shopname{width:273rpx;color:#333333;font-size:30rpx;text-align:center;position:relative;top:111rpx;margin:0 auto}.membershop .pri{position:relative;top:127rpx;text-align:center;font-size:30rpx;color:#09BB07}.membershop .pri>view:last-child{font-size:24rpx}.membershop .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}
-  width: 373rpx;
-  height: 557rpx;
-  background-color: #FBFBFB;
-}
-
-.membershop .pic {
-  width: 113rpx;
-  height: 256rpx;
-  background-color: white;
-  margin: 0 auto;
-  position: relative;
-  top: 64rpx;
-  left: 121rpx;
-}
-
-.membershop .shopname {
-  width: 273rpx;
-  color: #333333;
-  font-size: 30rpx;
-  text-align: center;
-  position: relative;
-  top: 111rpx;
-  margin: 0 auto;
-}
-
-.membershop .pri {
-  position: relative;
-  top: 127rpx;
-  text-align: center;
-  font-size: 30rpx;
-  color: #09BB07;
-}

components/member/membertop/membertop.js

@@ -1,23 +1,23 @@
-// components/member/membertop/membertop.js
+// components/member/membertop/membertop.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的初始数据
+   * 组件的初始数据
-   */
+   */
-  data: {
+  data: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的方法列表
+   * 组件的方法列表
-   */
+   */
-  methods: {
+  methods: {
-
+
-  }
+  }
-})
+})

components/member/membertop/membertop.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/member/membertop/membertop.wxml

@@ -1,3 +1,3 @@
-<view class="membertop">
+<view class="membertop">
-        购买下方商品成为会员
+        购买下方商品成为会员
 </view>

components/member/membertop/membertop.wxss

@@ -1,9 +1,9 @@
-.membertop {
+.membertop {
-  width: 100%;
+  width: 100%;
-  height: 86rpx;
+  height: 86rpx;
-  border-top: 2rpx solid #E8E8E8;
+  border-top: 2rpx solid #E8E8E8;
-  color: #999999;
+  color: #999999;
-  font-size: 24rpx;
+  font-size: 24rpx;
-  line-height: 86rpx;
+  line-height: 86rpx;
-  text-indent: 30rpx;
+  text-indent: 30rpx;
-}
+}

components/order/commodity/index.js

@@ -1,10 +1,67 @@
+import bin from "../../../utils/bin"
 Component({
-    properties: {},
+    properties: {
+        num: String,
+        cprice: String,
+        freight: String,
+        goods: Array,
+        gid: String,
+        type:String
+    },
     data: {},
     methods: {
-        todetail() {
+        shouhuo(){
-            wx.navigateTo({
+            bin.getuserid().then((id)=>{
-                url: "/pages/undetermined/undetermined"
+                bin.request({
+                    url:"User/orderConfirm",
+                    urldata:{
+                        user_id:id,
+                        order_id:this.data.gid
+                    }
+                }).then((res)=>{
+                    console.log(res)
+                    this.triggerEvent('shua',  { bubbles: true,composed: true  })
+
+                })
+            })
+        },
+        cancel() {
+            bin.getuserid().then((id) => {
+                bin.request({
+                    url: "User/cancelOrder",
+                    urldata: {
+                        user_id: id,
+                        order_id: this.data.gid
+                    }
+                }).then((res) => {
+                    console.log(res)
+                    this.triggerEvent('shua',  { bubbles: true,composed: true  })
+                })
+            })
+
+        },
+        pay(){
+            bin.getuserid().then((id)=>{
+                bin.request({
+                    url:"Cart/getWXPayData",
+                    urldata:{
+                        user_id:id,
+                        order_id:this.data.gid
+                    }
+                }).then((res)=>{
+                    console.log(res)
+                    wx.requestPayment({
+                        timeStamp:res.data.result.wdata.timeStamp + "",
+                        nonceStr:res.data.result.wdata.nonceStr,
+                        package:res.data.result.wdata.package,
+                        signType:"MD5",
+                        paySign:res.data.result.wdata.sign,
+                        complete(){
+                            this.triggerEvent('shua',  { bubbles: true,composed: true  })
+
+                        }
+                    })
+                })
             })
         }
     }

components/order/commodity/index.scss

@@ -9,7 +9,7 @@
     .image {
       width: 141rpx;
       height: 150rpx;
-      background-color: #000;
+      // background-color: #000;
       margin-left: 34rpx;
     }
     .introduce {

components/order/commodity/index.wxml

@@ -1,14 +1,16 @@
-<view class="commodity" bindtap="todetail">
+<view class="commodity">
-                <message></message>
+    <message wx:for="{{goods}}" title="{{item.goods_name}}" spec="{{item.spec_key_name}}" price="{{item.goods_price}}" num="{{item.goods_num}}" image="{{item.image}}"></message>
-                <view class="aggregate">
+    <view class="aggregate">
-                    共计1件商品  合计: 
+        共计{{num}}件商品  合计:
-                    <text>￥29.80</text> 
+        <text>￥{{cprice}}</text>
-                    (含运费￥0.00)
+        (含运费￥{{freight}})
-                </view>
+    </view>
-                <view class="operation">
+    <view class="operation" wx:if="{{type == 1}}">
-                    <view class="button">评价</view>
+        <view class="button" catch:tap="cancel">取消订单</view>
-
+        <view class="button hlight" catch:tap="pay">立即付款</view>
-                    <view class="button hlight">评价</view>
+    </view>
-
+       <view class="operation" wx:if="{{type == 3}}">
-                </view>
+        <!-- <view class="button" catch:tap="cancel">取消订单</view> -->
-            </view>
+        <view class="button hlight" catch:tap="shouhuo">确认收货</view>
+    </view>
+</view>

components/order/commodity/index.wxss

@@ -1 +1 @@
-.commodity{margin-top:20rpx;background-color:#fff}.commodity .message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.commodity .message .image{width:141rpx;height:150rpx;background-color:#000;margin-left:34rpx}.commodity .message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.commodity .message .introduce .title{font-size:28rpx;color:#333}.commodity .message .introduce .count{font-size:24rpx;color:#999;display:flex}.commodity .message .introduce .count>view{margin-right:27rpx}.commodity .message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}.commodity .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #F2F2F2}.commodity .aggregate>text{color:#333;margin:0 5rpx}.commodity .operation{height:84rpx;display:flex;justify-content:flex-end;padding:0 30rpx;align-items:center}.commodity .operation .button{width:133rpx;height:51rpx;border:2rpx solid #999999;border-radius:26rpx;text-align:center;font-size:22rpx;color:#999999;line-height:51rpx;margin-right:8rpx}.commodity .operation .hlight{border:2rpx solid #47c877;color:#47C877}
+.commodity{margin-top:20rpx;background-color:#fff}.commodity .message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.commodity .message .image{width:141rpx;height:150rpx;margin-left:34rpx}.commodity .message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.commodity .message .introduce .title{font-size:28rpx;color:#333}.commodity .message .introduce .count{font-size:24rpx;color:#999;display:flex}.commodity .message .introduce .count>view{margin-right:27rpx}.commodity .message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}.commodity .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #F2F2F2}.commodity .aggregate>text{color:#333;margin:0 5rpx}.commodity .operation{height:84rpx;display:flex;justify-content:flex-end;padding:0 30rpx;align-items:center}.commodity .operation .button{width:133rpx;height:51rpx;border:2rpx solid #999999;border-radius:26rpx;text-align:center;font-size:22rpx;color:#999999;line-height:51rpx;margin-right:8rpx}.commodity .operation .hlight{border:2rpx solid #47c877;color:#47C877}

components/order/message/index.js

@@ -1,5 +1,10 @@
 Component({
     properties: {
+        title:String,
+        spec:String,
+        price:String,
+        num:String,
+        image:String
     },
     data: {
     },

components/order/message/index.scss

@@ -1,3 +1,14 @@
+.towline {
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2;
+}
 .message {
   padding: 35rpx;
 display: flex;
@@ -6,7 +17,7 @@ border-bottom: 1rpx solid #F2F2F2;
 .image {
   width: 141rpx;
   height: 150rpx;
-  background-color: #000;
+  // background-color: #000;
   margin-left: 34rpx;
 }
 .introduce {

components/order/message/index.wxml

@@ -1,14 +1,14 @@
 <view class="message">
-                    <image class="image"></image>
+                    <image class="image" src="{{image}}"></image>
                     <view class="introduce">
-                        <view class="title">001|德国双心药房版 胶原蛋白美容口服液养颜</view>
+                        <view class="title towline">{{title}}</view>
                         <view class="count">
-                            <view>30只</view>
+                            <view>{{spec}}</view>
-                            <view>1.0356kg</view>
+                            <!-- <view>1.0356kg</view> -->
                         </view>
                     </view>
                     <view class="parameter">
-                        <view class="price">￥29.80</view>
+                        <view class="price">￥{{price}}</view>
-                        <view class="num">x2</view>
+                        <view class="num">x{{num}}</view>
                     </view>
                 </view>

components/order/message/index.wxss

@@ -1 +1 @@
-.message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.message .image{width:141rpx;height:150rpx;background-color:#000;margin-left:34rpx}.message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.message .introduce .title{font-size:28rpx;color:#333}.message .introduce .count{font-size:24rpx;color:#999;display:flex}.message .introduce .count>view{margin-right:27rpx}.message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}
+.towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.message .image{width:141rpx;height:150rpx;margin-left:34rpx}.message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.message .introduce .title{font-size:28rpx;color:#333}.message .introduce .count{font-size:24rpx;color:#999;display:flex}.message .introduce .count>view{margin-right:27rpx}.message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}

components/order/tab/index.js

@@ -1,8 +1,114 @@
+import bin from "../../../utils/bin"
 Component({
     properties: {
+        index:Number
     },
     data: {
     },
     methods: {
+        receivingw(a){
+            // receiving
+            wx.navigateTo({
+                url: "/pages/receiving/receiving?id=" + a.target.dataset.id
+            })
+        },
+        receivings(a){
+             console.log(a)
+            wx.navigateTo({
+                url: "/pages/undetermined/undetermined?id=" + a.target.dataset.id
+            })
+        },
+        todetail(a) {
+            console.log(a)
+            // return ;
+            wx.navigateTo({
+                url: "/pages/particulars/particulars?id=" + a.target.dataset.id
+            })
+        },
+        getorder(res){
+            bin.request({
+                url:"User/getOrderList",
+                urldata:{
+                    user_id:res,
+                    type:"WAITPAY",
+                    page:"0"
+                }
+            }).then((r)=>{
+                console.log(r)
+                this.setData({
+                    WAITPAY:r.data.result
+                })
+            })
+            bin.request({
+                url:"User/getOrderList",
+                urldata:{
+                    user_id:res,
+                    type:"WAITSEND",
+                    page:"0"
+                }
+            }).then((r)=>{
+                console.log(r)
+                this.setData({
+                    WAITSEND:r.data.result
+                })
+            })
+            bin.request({
+                url:"User/getOrderList",
+                urldata:{
+                    user_id:res,
+                    type:"WAITRECEIVE",
+                    page:"0"
+                }
+            }).then((r)=>{
+                console.log(r)
+                  this.setData({
+                    WAITRECEIVE:r.data.result
+                })
+            })
+            bin.request({
+                url:"User/getOrderList",
+                urldata:{
+                    user_id:res,
+                    type:"FINISH",
+                    page:"0"
+                }
+            }).then((r)=>{
+                console.log(r)
+                this.setData({
+                    FINISH:r.data.result
+                })
+            })
+            bin.request({
+                url:"User/getOrderList",
+                urldata:{
+                    user_id:res,
+                    type:"AFTERSALE",
+                    page:"0"
+                }
+            }).then((r)=>{
+                console.log(r)
+                this.setData({
+                    AFTERSALE:r.data.result
+                })
+            })
+        },
+        getlist(){
+            bin.getuserid().then((res)=>{
+              this.getorder(res)
+            })
+        }   ,
+        receiving(){
+
+        },
+        shua(){
+            console.log(123)
+            this.getlist()
+
+        }
+        
+    },
+    ready(){
+        this.getlist()
     }
+    
 })

components/order/tab/index.wxml

@@ -1,9 +1,17 @@
-<van-tabs class="tab" swipe-threshold="5">
+<van-tabs class="tab" swipe-threshold="5" active="{{index}}">
-        <van-tab title="待付款">
+    <van-tab title="待付款" bind:tap="todetail">
-            <commodity></commodity>
+        <commodity bind:shua="shua" wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}" gid="{{item.order_id}}" type="1"></commodity>
-        </van-tab>
+    </van-tab>
-        <van-tab title="代发货"></van-tab>
+    <van-tab title="待发货" bind:tap="receivings">
-        <van-tab title="待收货"> </van-tab>
+        <commodity bind:shua="shua" wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
-        <van-tab title="已完成"> </van-tab>
+    </van-tab>
-        <van-tab title="售后"> </van-tab>
+    <van-tab title="待收货" bind:tap="receivingw">
-    </van-tabs>
+        <commodity bind:shua="shua" wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" type="3" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" gid="{{item.order_id}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+    <van-tab title="已完成" bind:tap="receivingw">
+        <commodity bind:shua="shua" wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}"  data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+    <van-tab title="售后">
+        <commodity bind:shua="shua" wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}"  data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+</van-tabs>

components/orderconfirm/input/input.js

@@ -0,0 +1,26 @@
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    title: String,
+    placeholder: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    input(a) {
+      this.triggerEvent("input",{value:a.detail.value})
+    }
+  }
+})

components/orderconfirm/input/input.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/orderconfirm/input/input.scss

@@ -0,0 +1,21 @@
+.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;
+    align-items: center;
+    .left {
+        margin-left: 31rpx
+    }
+    .right {
+        margin-right: 20rpx;
+        width: 450rpx;
+        height: 35rpx;
+        font-size: 25rpx;
+        text-align: right;
+    }
+}

components/orderconfirm/input/input.wxml

@@ -0,0 +1,4 @@
+<view class="orderyf">
+    <view class="left">{{title}}</view>
+    <input class="right" bindinput="input" placeholder="{{placeholder}}"></input>
+</view>

components/orderconfirm/input/input.wxss

@@ -0,0 +1 @@
+.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;align-items:center}.orderyf .left{margin-left:31rpx}.orderyf .right{margin-right:20rpx;width:450rpx;height:35rpx;font-size:25rpx;text-align:right}

components/orderconfirm/orderagreement/orderagreement.js

@@ -1,23 +1,27 @@
-// components/orderconfirm/orderagreement/orderagreement.js
+// components/orderconfirm/orderagreement/orderagreement.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的初始数据
+   * 组件的初始数据
-   */
+   */
-  data: {
+  data: {
-
+    s:false
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的方法列表
+   * 组件的方法列表
-   */
+   */
-  methods: {
+  methods: {
-
+    a(){
-  }
+      this.setData({
-})
+        s:!this.data.s
+      })
+    }
+  }
+})

components/orderconfirm/orderagreement/orderagreement.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/orderconfirm/orderagreement/orderagreement.scss

@@ -16,4 +16,7 @@
         margin-right: 25rpx;
         margin-left: 31rpx;
     }
+    .selects{
+        background-color: #47C877;
+    }
 }

components/orderconfirm/orderagreement/orderagreement.wxml

@@ -1,4 +1,4 @@
-<view class="agree">
+<view class="agree" bind:tap="a">
-     <view class="select"></view>
+     <view class="select {{s?'selects':''}}"></view>
-     <text>同意使用条款和隐私政策</text>
+     <text>同意使用条款和隐私政策</text>
 </view>

components/orderconfirm/orderagreement/orderagreement.wxss

@@ -1,18 +1 @@
-.agree {
+.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 .selects{background-color:#47C877}
-  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;
-}

components/orderconfirm/orderbottom/orderbottom.js

@@ -1,27 +1,28 @@
-// components/orderconfirm/orderbottom/orderbottom.js
+// components/orderconfirm/orderbottom/orderbottom.js
-Component({
+Component({
-    /**
+    /**
-     * 组件的属性列表
+     * 组件的属性列表
-     */
+     */
-    properties: {
+    properties: {
-
+        price:String
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的初始数据
+     * 组件的初始数据
-     */
+     */
-    data: {
+    data: {
-
+
-    },
+    },
-
+
-    /**
+    /**
-     * 组件的方法列表
+     * 组件的方法列表
-     */
+     */
-    methods: {
+    methods: {
-        sub() {
+        sub() {
-            wx.navigateTo({
+            // wx.navigateTo({
-                url: "/pages/order/order"
+            //     url: "/pages/order/order"
-            })
+            // })
-        }
+            this.triggerEvent("sub")
-    }
+        }
+    }
 })

components/orderconfirm/orderbottom/orderbottom.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/orderconfirm/orderbottom/orderbottom.wxml

@@ -1,7 +1,7 @@
-<view class="bottom">
+<view class="bottom">
-    <view class="left">
+    <view class="left">
-        <text>总计</text>
+        <text>总计</text>
-        <text class="pri">$0.00</text>
+        <text class="pri">${{price}}</text>
-    </view>
+    </view>
-    <view class="right"  bindtap="sub">结算</view>
+    <view class="right"  bindtap="sub">结算</view>
 </view>

components/orderconfirm/orderbottom/orderbottom.wxss

@@ -1,24 +1,24 @@
-.bottom {
+.bottom {
-  width: 100%;
+  width: 100%;
-  height: 99rpx;
+  height: 99rpx;
-  line-height: 99rpx;
+  line-height: 99rpx;
-  display: flex;
+  display: flex;
-  justify-content: space-between;
+  justify-content: space-between;
-  border-top: 2rpx solid #EAEAEA;
+  border-top: 2rpx solid #EAEAEA;
-  font-size: 28rpx;
+  font-size: 28rpx;
-}
+}
-
+
-.bottom .left {
+.bottom .left {
-  margin-left: 59rpx;
+  margin-left: 59rpx;
-}
+}
-
+
-.bottom .left .pri {
+.bottom .left .pri {
-  color: #E0C79D;
+  color: #E0C79D;
-  font-size: 26rpx;
+  font-size: 26rpx;
-  margin-left: 19rpx;
+  margin-left: 19rpx;
-}
+}
-
+
-.bottom .right {
+.bottom .right {
-  color: #4CC97D;
+  color: #4CC97D;
-  margin-right: 38rpx;
+  margin-right: 38rpx;
-}
+}

components/orderconfirm/orderchooseaddr/orderchooseaddr.js

@@ -1,27 +1,30 @@
-// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
+// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
-Component({
+Component({
-    /**
+    /**
-     * 组件的属性列表
+     * 组件的属性列表
-     */
+     */
-    properties: {
+    properties: {
-
+        name:String,
-    },
+        number:String,
-
+        phone:String,
-    /**
+        addr:String
-     * 组件的初始数据
+    },
-     */
+
-    data: {
+    /**
-
+     * 组件的初始数据
-    },
+     */
-
+    data: {
-    /**
+
-     * 组件的方法列表
+    },
-     */
+
-    methods: {
+    /**
-        choose() {
+     * 组件的方法列表
-            wx.navigateTo({
+     */
-                url: "/pages/chooseaddr/chooseaddr"
+    methods: {
-            })
+        choose() {
-        }
+            wx.navigateTo({
-    }
+                url: "/pages/chooseaddr/chooseaddr"
+            })
+        }
+    }
 })

components/orderconfirm/orderchooseaddr/orderchooseaddr.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml

@@ -1,12 +1,12 @@
-<view class="orderchooseaddr" bindtap="choose">
+<view class="orderchooseaddr" bindtap="choose">
-    <view class="left">
+    <view class="left">
-        <view class="userinfo">
+        <view class="userinfo">
-            <text class="username">于于宇  15698857895</text>
+            <text class="username">{{name  == "" ? "请选择地址" :name}}  {{phone}}</text>
-            <text>邮政编码：677467</text>
+            <text>邮政编码：{{number}}</text>
-        </view>
+        </view>
-        <view class="addr">
+        <view class="addr">
-            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
+            {{addr}}
-        </view>
+</view>
-    </view>
+    </view>
-    <view class="right"></view>
+    <view class="right"></view>
 </view>

components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss

@@ -1,37 +1,37 @@
-.orderchooseaddr {
+.orderchooseaddr {
-  width: 690rpx;
+  width: 690rpx;
-  height: 148rpx;
+  height: 148rpx;
-  margin: 0 auto;
+  margin: 0 auto;
-  border-bottom: 2rpx solid #EAEAEA;
+  border-bottom: 2rpx solid #EAEAEA;
-  display: flex;
+  display: flex;
-  justify-content: space-between;
+  justify-content: space-between;
-}
+}
-
+
-.orderchooseaddr .left {
+.orderchooseaddr .left {
-  width: 572rpx;
+  width: 572rpx;
-  height: 80rpx;
+  height: 80rpx;
-}
+}
-
+
-.orderchooseaddr .left .userinfo {
+.orderchooseaddr .left .userinfo {
-  color: #333333;
+  color: #333333;
-  font-size: 26rpx;
+  font-size: 26rpx;
-  text-indent: 30rpx;
+  text-indent: 30rpx;
-  margin-top: 41rpx;
+  margin-top: 41rpx;
-  display: flex;
+  display: flex;
-  justify-content: space-between;
+  justify-content: space-between;
-}
+}
-
+
-.orderchooseaddr .left .addr {
+.orderchooseaddr .left .addr {
-  color: #999999;
+  color: #999999;
-  font-size: 24rpx;
+  font-size: 24rpx;
-  text-indent: 30rpx;
+  text-indent: 30rpx;
-  margin-top: 32rpx;
+  margin-top: 32rpx;
-}
+}
-
+
-.orderchooseaddr .right {
+.orderchooseaddr .right {
-  width: 17rpx;
+  width: 17rpx;
-  height: 30rpx;
+  height: 30rpx;
-  background-color: #D3D3D3;
+  background-color: #D3D3D3;
-  margin: auto 0;
+  margin: auto 0;
-  margin-right: 19rpx;
+  margin-right: 19rpx;
-}
+}

components/orderconfirm/orderchooseway/orderchooseway.js

@@ -1,23 +1,36 @@
-// components/orderconfirm/orderchooseway/orderchooseway.js
+// components/orderconfirm/orderchooseway/orderchooseway.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的初始数据
+   * 组件的初始数据
-   */
+   */
-  data: {
+  data: {
-
+    id:0
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的方法列表
+   * 组件的方法列表
-   */
+   */
-  methods: {
+  methods: {
-
+    a(a){
-  }
+      // console.log(a)
-})
+      this.setData({
+        id:0
+      })
+      this.triggerEvent("tab",{id:0})
+    },
+    b(){
+      this.setData({
+        id:1
+      })
+      this.triggerEvent("tab",{id:1})
+
+    }
+  }
+})

components/orderconfirm/orderchooseway/orderchooseway.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/orderconfirm/orderchooseway/orderchooseway.wxml

@@ -1,10 +1,10 @@
-<view class="chooseway">
+<view class="chooseway" >
-    <view class="item item1">
+    <view class="item item1" bind:tap="a">
-        <view class="select selected"></view>
+        <view class="select {{id == 0 ? 'selected' : ''}}"></view>
-        <text class="way">快递配送</text>
+        <text class="way">快递配送</text>
-    </view>
+    </view>
-    <view class="item">
+    <view class="item" bind:tap="b">
-        <view class="select"></view>
+        <view class="select {{id == 1 ? 'selected' : ''}}"></view>
-        <text class="way">到店自取</text>
+        <text class="way">到店自取</text>
-    </view>
+    </view>
 </view>

components/orderconfirm/orderchooseway/orderchooseway.wxss

@@ -1,35 +1,35 @@
-.chooseway {
+.chooseway {
-  width: 690rpx;
+  width: 690rpx;
-  height: 96rpx;
+  height: 96rpx;
-  line-height: 96rpx;
+  line-height: 96rpx;
-  display: flex;
+  display: flex;
-  border-bottom: 2rpx solid #EAEAEA;
+  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
+  margin: 0 auto;
-}
+}
-
+
-.chooseway .item {
+.chooseway .item {
-  display: flex;
+  display: flex;
-  margin-right: 90rpx;
+  margin-right: 90rpx;
-}
+}
-
+
-.chooseway .item .select {
+.chooseway .item .select {
-  width: 26rpx;
+  width: 26rpx;
-  height: 26rpx;
+  height: 26rpx;
-  margin: auto 0;
+  margin: auto 0;
-  border-radius: 50%;
+  border-radius: 50%;
-  background-color: #EAEAEA;
+  background-color: #EAEAEA;
-}
+}
-
+
-.chooseway .item .selected {
+.chooseway .item .selected {
-  background-color: #47C877;
+  background-color: #47C877;
-}
+}
-
+
-.chooseway .item .way {
+.chooseway .item .way {
-  color: #333333;
+  color: #333333;
-  font-size: 26rpx;
+  font-size: 26rpx;
-  text-indent: 17rpx;
+  text-indent: 17rpx;
-}
+}
-
+
-.chooseway .item1 {
+.chooseway .item1 {
-  margin-left: 31rpx;
+  margin-left: 31rpx;
-}
+}

components/orderconfirm/ordershopinfo/ordershopinfo.js

@@ -1,23 +1,26 @@
-// components/orderconfirm/ordershopinfo/ordershopinfo.js
+// components/orderconfirm/ordershopinfo/ordershopinfo.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+    title:String,
-  },
+    spec:String,
-
+    price:String,
-  /**
+    img:String
-   * 组件的初始数据
+  },
-   */
+
-  data: {
+  /**
-
+   * 组件的初始数据
-  },
+   */
-
+  data: {
-  /**
+
-   * 组件的方法列表
+  },
-   */
+
-  methods: {
+  /**
-
+   * 组件的方法列表
-  }
+   */
-})
+  methods: {
+
+  }
+})

components/orderconfirm/ordershopinfo/ordershopinfo.json

@@ -1,6 +1,6 @@
-{
+{
-    "component": true,
+    "component": true,
-    "usingComponents": {
+    "usingComponents": {
-
+
-    }
+    }
 }

components/orderconfirm/ordershopinfo/ordershopinfo.wxml

@@ -1,13 +1,13 @@
 <view class="shopinfo">
-    <image class="pic"></image>
+    <image class="pic" src="{{img}}"></image>
     <view class="right">
-        <view class="shopname">产品产品产品产品产品产品产品产品产品产品产品产品产品</view>
+        <view class="shopname">{{title}}</view>
         <view class="down">
             <view class="shopdesc">
-                <text class="size">规格10ml</text>
+                <text class="size">{{spec}}</text>
-                <text> 0.04kg</text>
+                <!-- <text> 0.04kg</text> -->
             </view>
-            <view class="pri">￥657</view>
+            <view class="pri">￥{{price}}</view>
         </view>
     </view>
 </view>

components/orderconfirm/ordershopinfo/ordershopinfo.wxss

@@ -1,49 +1,49 @@
-.shopinfo {
+.shopinfo {
-  width: 690rpx;
+  width: 690rpx;
-  height: 218rpx;
+  height: 218rpx;
-  border-bottom: 2rpx solid #EAEAEA;
+  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
+  margin: 0 auto;
-  display: flex;
+  display: flex;
-  justify-content: center;
+  justify-content: center;
-}
+}
-
+
-.shopinfo .pic {
+.shopinfo .pic {
-  width: 150rpx;
+  width: 150rpx;
-  height: 163rpx;
+  height: 163rpx;
-  background-color: #EAEAEA;
+  background-color: #EAEAEA;
-  margin-right: 40rpx;
+  margin-right: 40rpx;
-}
+}
-
+
-.shopinfo .right {
+.shopinfo .right {
-  width: 402rpx;
+  width: 402rpx;
-  display: flex;
+  display: flex;
-  flex-direction: column;
+  flex-direction: column;
-  justify-content: space-between;
+  justify-content: space-between;
-  margin-top: 6rpx;
+  margin-top: 6rpx;
-}
+}
-
+
-.shopinfo .right .shopname {
+.shopinfo .right .shopname {
-  font-size: 28rpx;
+  font-size: 28rpx;
-  font-weight: bold;
+  font-weight: bold;
-  line-height: 39rpx;
+  line-height: 39rpx;
-}
+}
-
+
-.shopinfo .right .down {
+.shopinfo .right .down {
-  margin-bottom: 50rpx;
+  margin-bottom: 50rpx;
-  display: flex;
+  display: flex;
-  justify-content: space-between;
+  justify-content: space-between;
-}
+}
-
+
-.shopinfo .right .down .shopdesc {
+.shopinfo .right .down .shopdesc {
-  color: #666666;
+  color: #666666;
-  font-size: 24rpx;
+  font-size: 24rpx;
-}
+}
-
+
-.shopinfo .right .down .shopdesc .size {
+.shopinfo .right .down .shopdesc .size {
-  margin-right: 20rpx;
+  margin-right: 20rpx;
-}
+}
-
+
-.shopinfo .right .down .pri {
+.shopinfo .right .down .pri {
-  color: #E1C89F;
+  color: #E1C89F;
-  font-size: 28rpx;
+  font-size: 28rpx;
-}
+}

components/orderconfirm/orderyf/orderyf.js

@@ -1,23 +1,23 @@
-// components/orderconfirm/orderyf/orderyf.js
+// components/orderconfirm/orderyf/orderyf.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+    price:String
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的初始数据
+   * 组件的初始数据
-   */
+   */
-  data: {
+  data: {
-
+
-  },
+  },
-
+
-  /**
+  /**
-   * 组件的方法列表
+   * 组件的方法列表
-   */
+   */
-  methods: {
+  methods: {
-
+
-  }
+  }
-})
+})

components/orderconfirm/orderyf/orderyf.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/orderconfirm/orderyf/orderyf.wxml

@@ -1,4 +1,4 @@
-<view class="orderyf">
+<view class="orderyf">
-    <view class="left">运费</view>
+    <view class="left">运费</view>
-    <view class="right">￥16</view>
+    <view class="right">￥{{price}}</view>
 </view>

components/orderconfirm/orderyf/orderyf.wxss

@@ -1,18 +1,18 @@
-.orderyf {
+.orderyf {
-  width: 690rpx;
+  width: 690rpx;
-  height: 96rpx;
+  height: 96rpx;
-  line-height: 96rpx;
+  line-height: 96rpx;
-  display: flex;
+  display: flex;
-  border-bottom: 2rpx solid #EAEAEA;
+  border-bottom: 2rpx solid #EAEAEA;
-  margin: 0 auto;
+  margin: 0 auto;
-  justify-content: space-between;
+  justify-content: space-between;
-  font-size: 28rpx;
+  font-size: 28rpx;
-}
+}
-
+
-.orderyf .left {
+.orderyf .left {
-  margin-left: 31rpx;
+  margin-left: 31rpx;
-}
+}
-
+
-.orderyf .right {
+.orderyf .right {
-  margin-right: 20rpx;
+  margin-right: 20rpx;
-}
+}

components/orderconfirm/time/time.js

@@ -0,0 +1,40 @@
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    price: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    date: "",
+    start:""
+  },
+  created(){
+    this.setData({
+      date:this.getCurTime(),
+      start:this.getCurTime()
+    })
+  }, 
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    bindDateChange: function (e) {
+      console.log('picker发送选择改变，携带值为', e.detail.value)
+      this.setData({
+        date: e.detail.value
+      })
+      this.triggerEvent("input",{date:e.detail.value})
+    },
+    getCurTime() {
+      var date = new Date();
+      return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+
+    }
+  }
+})

components/orderconfirm/time/time.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/orderconfirm/time/time.scss

@@ -0,0 +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;
+        ;
+    }
+}

components/orderconfirm/time/time.wxml

@@ -0,0 +1,6 @@
+<picker mode="date" value="{{date}}" bindchange="bindDateChange" start="{{start}}">
+    <view class="orderyf">
+        <view class="left">收货时间</view>
+        <view class="right">{{date == "" ? '请选择提货时间': date}}</view>
+    </view>
+</picker>

components/orderconfirm/time/time.wxss

@@ -0,0 +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;
+}

components/particulars/content/index.js

@@ -1,5 +1,13 @@
 Component({
     properties: {
+        num:String,
+        price:String,
+        cprice:String,
+        number:String,
+        time:String,
+        text:String,
+        goods:Array,
+        ziti:String
     },
     data: {
     },

components/particulars/content/index.wxml

@@ -1,24 +1,24 @@
 <view class="content">
-    <message></message>
+    <message wx:for="{{goods}}" wx:for-index="j" wx:key="{{j}}" image="{{item.image}}" title="{{item.goods_name}}" spec="{{item.spec_ley_name}}" price="{{item.goods_price}}"  num="{{item.goods_price}}"></message>
     <view class="aggregate">
-        共计1件商品  合计:
+        共计{{num}}件商品  合计:
-        <text>￥29.80</text>
+        <text>￥{{price}}</text>
-        (含运费￥0.00)
+        (含运费￥{{cprice}})
     </view>
     <view class="message">
         <text>订单编号</text>
-        <text>123456789123456789</text>
+        <text>{{number}}</text>
     </view>
     <view class="message">
         <text>下单时间</text>
-        <text>2018-10-01  18:00:06</text>
+        <text>{{time}}</text>
     </view>
     <view class="message">
         <text>配送方式</text>
-        <text>快递  免邮</text>
+        <text>{{ziti == 1?"自提":"快递"}} </text>
     </view>
     <view class="leave">
         <text>备注：</text>
-        <input type="text" placeholder="填写你需要对我们说的" />
+        <input type="text" placeholder="{{text}}" />
     </view>
 </view>

components/particulars/orderchooseaddr/index.js

@@ -1,5 +1,8 @@
 Component({
     properties: {
+        name:String,
+        phone:String,
+        addr:String
     },
     data: {
     },

components/particulars/orderchooseaddr/index.wxml

@@ -1,10 +1,10 @@
 <view class="orderchooseaddr">
         <view class="left">
             <view class="userinfo">
-                <text class="username">于于宇  15698857895</text>
+                <text class="username">{{name}}  {{phone}}</text>
                 <text></text>
             </view>
-            <view class="addr">中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
+            <view class="addr">{{addr}}</view>
         </view>
         <view class="right"></view>
     </view>

components/seles/merchandises/index.scss

@@ -5,7 +5,7 @@
   .image {
     width: 171rpx;
     height: 168rpx;
-    background-color: #000;
+    // background-color: #000;
   }
   .message {
     margin-left: 24rpx;

components/seles/merchandises/index.wxss

@@ -1 +1 @@
-.merchandise{padding:46rpx 32rpx;display:flex;border-bottom:20rpx solid #fbfbfb}.merchandise .image{width:171rpx;height:168rpx;background-color:#000}.merchandise .message{margin-left:24rpx}.merchandise .message .title{font-size:26rpx;color:#333;width:491rpx;margin-bottom:9rpx}.merchandise .message .brief{font-size:22rpx;color:#999;margin-bottom:26rpx}.merchandise .message .price{font-size:28rpx;color:#ff4e6c}
+.merchandise{padding:46rpx 32rpx;display:flex;border-bottom:20rpx solid #fbfbfb}.merchandise .image{width:171rpx;height:168rpx}.merchandise .message{margin-left:24rpx}.merchandise .message .title{font-size:26rpx;color:#333;width:491rpx;margin-bottom:9rpx}.merchandise .message .brief{font-size:22rpx;color:#999;margin-bottom:26rpx}.merchandise .message .price{font-size:28rpx;color:#ff4e6c}

components/shopping/shoppingitem/shoppingitem.js

@@ -12,7 +12,8 @@ Component({
         gid:Number,
         num:Number,
         select:Boolean,
-        index:Number
+        index:Number,
+        oprice:String
     },
 
     /**
@@ -28,7 +29,7 @@ Component({
     methods: {
         rm() {
             
-            if (this.data.num == 0) {
+            if (this.data.num < 2) {
                 
                 return
             } else {
@@ -39,9 +40,10 @@ Component({
                     url:"Cart/updateNum",
                     urldata:{
                         id:this.data.gid,
-                        num:this.data.num - 1
+                        num:this.data.num 
                     }
                 }).then((res)=>{
+                this.triggerEvent('gai', {id:this.data.gid,num:this.data.num})
                     
                 })
                
@@ -55,10 +57,10 @@ Component({
                 url:"Cart/updateNum",
                 urldata:{
                     id:this.data.gid,
-                    num:this.data.num + 1
+                    num:this.data.num
                 }
             }).then((res)=>{
-                
+                this.triggerEvent('gai', {id:this.data.gid,num:this.data.num})
             })
         },
         sel(){

components/shopping/shoppingitem/shoppingitem.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }

components/shopping/shoppingitem/shoppingitem.wxml

@@ -1,16 +1,19 @@
 <view class="shoppingitem">
-    <view class="select {{select ? 'selects':''}}" bind:tap="sel"></view>
+    <view style="height: 200rpx;width:46rpx" bind:tap="sel">
-    <view class="pic">
+        <view class="select {{select ? 'selects':''}}"></view>
-        <image src="{{pic}}"></image>
     </view>
+    <image src="{{pic}}" class="pic"></image>
     <view class="shopinfo">
         <view class="shopname">{{shopname}}</view>
         <view class="shopdesc">{{shopdesc}}</view>
-        <view class="price">${{price}}</view>
+        <view class="price">
+            <view>€{{oprice}}</view>
+            <view>￥{{price}}</view>
+        </view>
     </view>
     <view class="numberset">
         <view class="reverse" bind:tap="rm">-</view>
         <view class="num">{{num}}</view>
         <view class="add" bind:tap="add">+</view>
     </view>
-</view>
+</view>

components/shopping/shoppingitem/shoppingitem.wxss

@@ -1,6 +1,6 @@
 .shoppingitem {
     width: 639rpx;
-    height: 186rpx;
+    /* height: 186rpx; */
     display: flex;
     justify-content: space-between;
 }
@@ -10,7 +10,7 @@
     height: 26rpx;
     background: rgba(234, 234, 234, 1);
     border-radius: 50%;
-    margin: auto 0;
+    margin: 87rpx 10rpx;
 }
 .selects{
     background-color: #45C778;
@@ -59,8 +59,13 @@
     font-size: 32rpx;
     font-weight: bold;
     text-decoration: underline;
+    display: flex;
+    align-items: center;
+}
+.price >view:last-child{
+    margin-left: 10rpx;
+    font-size: 20rpx;
 }
-
 .numberset {
     width: 85rpx;
     height: 186rpx;
@@ -73,13 +78,14 @@
 }
 
 .reverse {
-    width: 23rpx;
+    width: 63rpx;
-    height: 23rpx;
+    height: 63rpx;
     /* background-color: #97DFB4; */
     margin: 0 auto;
-    margin-top: 20rpx;
+    /* margin-top: 20rpx; */
-    line-height: 23rpx;
+    line-height: 63rpx;
     font-size: 46rpx;
+    text-align: center;
 }
 
 .num {
@@ -89,10 +95,12 @@
 }
 
 .add {
-    width: 23rpx;
+    width: 63rpx;
-    height: 23rpx;
+    height: 63rpx;
     /* background-color: #242424; */
     margin: 0 auto;
-    margin-bottom: 17rpx;
+    /* margin-bottom: 17rpx; */
-    line-height: 23rpx;
+    font-size: 46rpx;
+    line-height: 63rpx;
+    text-align: center;
 }

components/yue/share/share.js

@@ -1,23 +1,27 @@
-// components/yue/yongjintop/yongjintop.js
+// components/yue/yongjintop/yongjintop.js
-Component({
+Component({
-  /**
+  /**
-   * 组件的属性列表
+   * 组件的属性列表
-   */
+   */
-  properties: {
+  properties: {
-
+    name:String,
-  },
+    img:String,
-
+      A:String,
-  /**
+      B:String,
-   * 组件的初始数据
+      C:String
-   */
+  },
-  data: {
+
-
+  /**
-  },
+   * 组件的初始数据
-
+   */
-  /**
+  data: {
-   * 组件的方法列表
+
-   */
+  },
-  methods: {
+
-
+  /**
-  }
+   * 组件的方法列表
-})
+   */
+  methods: {
+
+  }
+})

components/yue/share/share.json

@@ -1,4 +1,4 @@
-{
+{
-  "component": true,
+  "component": true,
-  "usingComponents": {}
+  "usingComponents": {}
 }