玩啥那

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

@@ -10,6 +10,17 @@
  * 2. Prevent adjustments of font size after orientation changes in iOS.
  */
 
+ .towline {
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+
+  display: -webkit-box;
+
+  -webkit-box-orient: vertical;
+
+  -webkit-line-clamp: 2;
+}
 html {
   line-height: 1; /* 1 */
   -webkit-text-size-adjust: 100%; /* 2 */
@@ -159,7 +170,6 @@ img {
  * 2. Remove the margin in Firefox and Safari.
  */
 
-button,
 input,
 optgroup,
 select,
@@ -175,7 +185,6 @@ textarea {
  * 1. Show the overflow in Edge.
  */
 
-button,
 input {
   /* 1 */
   overflow: visible;
@@ -186,7 +195,6 @@ input {
  * 1. Remove the inheritance of text transform in Firefox.
  */
 
-button,
 select {
   /* 1 */
   text-transform: none;
@@ -196,19 +204,11 @@ select {
  * Correct the inability to style clickable types in iOS and Safari.
  */
 
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-
 /**
  * Remove the inner border and padding in Firefox.
  */
 
-button::-moz-focus-inner,
+
-[type="button"]::-moz-focus-inner,
 [type="reset"]::-moz-focus-inner,
 [type="submit"]::-moz-focus-inner {
   border-style: none;
@@ -219,8 +219,7 @@ button::-moz-focus-inner,
  * Restore the focus styles unset by the previous rule.
  */
 
-button:-moz-focusring,
+
-[type="button"]:-moz-focusring,
 [type="reset"]:-moz-focusring,
 [type="submit"]:-moz-focusring {
   outline: 1px dotted ButtonText;
@@ -353,5 +352,5 @@ template {
 }
 image {
   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.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/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

@@ -8,16 +8,16 @@
             </view>
             <view>邮政编码：{{youzheng}}</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="path">
             <text>默认</text>   
             {{address}}
             </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="path">
             <text>设为默认</text>   

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

@@ -7,6 +7,12 @@
     font-weight: bold;
     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>
+        <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

@@ -4,7 +4,11 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    img: String,
+    name: String,
+    price: String,
+    oprice: String,
+    gid:String
   },
 
   /**
@@ -18,6 +22,14 @@ Component({
    * 组件的方法列表
    */
   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.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/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">
-                    共计1件商品  合计: 
+        共计{{num}}件商品  合计:
-                    <text>￥29.80</text> 
+        <text>￥{{cprice}}</text>
-                    (含运费￥0.00)
+        (含运费￥{{freight}})
     </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 class="button" catch:tap="cancel">取消订单</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 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

@@ -11,13 +11,17 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    s:false
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-
+    a(){
+      this.setData({
+        s:!this.data.s
+      })
+    }
   }
 })

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>
 </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

@@ -4,7 +4,7 @@ Component({
      * 组件的属性列表
      */
     properties: {
-
+        price:String
     },
 
     /**
@@ -19,9 +19,10 @@ Component({
      */
     methods: {
         sub() {
-            wx.navigateTo({
+            // wx.navigateTo({
-                url: "/pages/order/order"
+            //     url: "/pages/order/order"
-            })
+            // })
+            this.triggerEvent("sub")
         }
     }
 })

components/orderconfirm/orderbottom/orderbottom.wxml

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

components/orderconfirm/orderchooseaddr/orderchooseaddr.js

@@ -4,7 +4,10 @@ Component({
      * 组件的属性列表
      */
     properties: {
-
+        name:String,
+        number:String,
+        phone:String,
+        addr:String
     },
 
     /**

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 class="username">{{name  == "" ? "请选择地址" :name}}  {{phone}}</text>
-            <text>邮政编码：677467</text>
+            <text>邮政编码：{{number}}</text>
         </view>
         <view class="addr">
-            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
+            {{addr}}
-        </view>
+</view>
     </view>
     <view class="right"></view>
 </view>

components/orderconfirm/orderchooseway/orderchooseway.js

@@ -11,13 +11,26 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    id:0
   },
 
   /**
    * 组件的方法列表
    */
   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.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>
     </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>
     </view>
 </view>

components/orderconfirm/ordershopinfo/ordershopinfo.js

@@ -4,7 +4,10 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    title:String,
+    spec:String,
+    price:String,
+    img:String
   },
 
   /**

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/orderyf/orderyf.js

@@ -4,7 +4,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    price:String
   },
 
   /**

components/orderconfirm/orderyf/orderyf.wxml

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

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.wxml

@@ -1,12 +1,15 @@
 <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>

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

@@ -4,7 +4,11 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    name:String,
+    img:String,
+      A:String,
+      B:String,
+      C:String
   },
 
   /**

components/yue/share/share.scss

@@ -6,7 +6,7 @@
     .img {
         width: 40rpx;
         height: 39rpx;
-        background-color: #999999;
+        // background-color: #999999;
         float: right;
     }
     .yongjintop {
@@ -45,7 +45,7 @@
     font-size: 28rpx;
     text-align: center;
     .midbox {
-        width: 478rpx;
+        width: 590rpx;
         height: 175rpx;
         display: flex;
         justify-content: space-between;
@@ -60,6 +60,7 @@
     }
     .money1 {
         color: #F81F1F;
+        font-size: 24rpx;
     }
     .line {
         width: 2rpx;

components/yue/share/share.wxml

@@ -1,9 +1,9 @@
 <view class="box">
-    <view class="img"></view>
+    <image class="img" src="../../../utils/img/share.png"></image>
     <view class="yongjintop">
-        <image class="photo"></image>
+        <image class="photo" src="{{img}}"></image>
         <view class="tel">
-            <view>156***578</view>
+            <view>{{name}}</view>
             <view class="mingpian">我的名片</view>
         </view>
     </view>
@@ -11,18 +11,26 @@
 <view class="mid">
     <view class="midbox">
  <view>
-        <view class="way">昨日收益</view>
+        <view class="way">A级</view>
         <view class="money">
-            <text class="money1">657.00</text>
+            <text class="money1">{{A}}</text>
-            <text>RMB</text>
+            <text>人</text>
         </view>
     </view>
     <view class="line"></view>
     <view>
-        <view class="way">昨日收益</view>
+        <view class="way">B级</view>
         <view class="money">
-            <text class="money1">657.00</text>
+            <text class="money1">{{B}}</text>
-            <text>RMB</text>
+            <text>人</text>
+        </view>
+    </view>
+    <view class="line"></view>
+      <view>
+        <view class="way">C级</view>
+        <view class="money">
+            <text class="money1">{{C}}</text>
+            <text>人</text>
         </view>
     </view>
     </view>

components/yue/share/share.wxss

@@ -1,78 +1 @@
-.box {
+.box{width:690rpx;margin:0 auto;padding-bottom:41rpx;border-bottom:2rpx solid #EEEEEE}.box .img{width:40rpx;height:39rpx;float:right}.box .yongjintop{width:317rpx;margin-top:71rpx;margin-left:30rpx;display:flex}.box .yongjintop .photo{width:130rpx;height:130rpx;background-color:gold;margin-bottom:52rpx;border-radius:90%}.box .yongjintop .tel{color:#333333;font-size:28rpx;margin-top:33rpx;margin-left:35rpx}.box .yongjintop .tel .mingpian{font-size:24rpx;color:#999999;margin-top:18rpx}.mid{width:100%;height:175rpx;border-bottom:20rpx solid #FBFBFB;color:#333333;font-size:28rpx;text-align:center}.mid .midbox{width:590rpx;height:175rpx;display:flex;justify-content:space-between;margin:0 auto}.mid .way{margin-top:46rpx;margin-bottom:14rpx}.mid .money{font-size:24rpx}.mid .money1{color:#F81F1F;font-size:24rpx}.mid .line{width:2rpx;height:60rpx;margin:auto 0;background-color:#EEEEEE}
-  width: 690rpx;
-  margin: 0 auto;
-  padding-bottom: 41rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-
-.box .img {
-  width: 40rpx;
-  height: 39rpx;
-  background-color: #999999;
-  float: right;
-}
-
-.box .yongjintop {
-  width: 317rpx;
-  margin-top: 71rpx;
-  margin-left: 30rpx;
-  display: flex;
-}
-
-.box .yongjintop .photo {
-  width: 130rpx;
-  height: 130rpx;
-  background-color: gold;
-  margin-bottom: 52rpx;
-  border-radius: 90%;
-}
-
-.box .yongjintop .tel {
-  color: #333333;
-  font-size: 28rpx;
-  margin-top: 33rpx;
-  margin-left: 35rpx;
-}
-
-.box .yongjintop .tel .mingpian {
-  font-size: 24rpx;
-  color: #999999;
-  margin-top: 18rpx;
-}
-
-.mid {
-  width: 100%;
-  height: 175rpx;
-  border-bottom: 20rpx solid #FBFBFB;
-  color: #333333;
-  font-size: 28rpx;
-  text-align: center;
-}
-
-.mid .midbox {
-  width: 478rpx;
-  height: 175rpx;
-  display: flex;
-  justify-content: space-between;
-  margin: 0 auto;
-}
-
-.mid .way {
-  margin-top: 46rpx;
-  margin-bottom: 14rpx;
-}
-
-.mid .money {
-  font-size: 24rpx;
-}
-
-.mid .money1 {
-  color: #F81F1F;
-}
-
-.mid .line {
-  width: 2rpx;
-  height: 60rpx;
-  margin: auto 0;
-  background-color: #EEEEEE;
-}

components/yue/yongjintop/yongjintop.js

@@ -4,7 +4,8 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    tel:String,
+    img:String
   },
 
   /**

components/yue/yongjintop/yongjintop.scss

@@ -12,12 +12,13 @@
             width: 130rpx;
             height: 130rpx;
             background-color: gold;
-            margin-bottom: 44rpx;
+            margin-bottom: 24rpx;
             border-radius: 90%;
         }
         .tel {
             color: #333333;
             font-size: 28rpx;
+            text-align: center;
         }
     }
 }

components/yue/yongjintop/yongjintop.wxml

@@ -1,7 +1,7 @@
 <view class="box">
     <view class="yongjintop">
-        <image class="photo"></image>
+        <image class="photo" src="{{img}}"></image>
-        <view class="tel">156***578</view>
+        <view class="tel">{{tel}}</view>
     </view>
 </view>
 <view class="mid">
@@ -9,15 +9,15 @@
  <view>
         <view class="way">昨日收益</view>
         <view class="money">
-            <text class="money1">657.00</text>
+            <text class="money1">0</text>
             <text>RMB</text>
         </view>
     </view>
     <view class="line"></view>
       <view>
-        <view class="way">昨日收益</view>
+        <view class="way">累计收益</view>
         <view class="money">
-            <text class="money1">657.00</text>
+            <text class="money1">0</text>
             <text>RMB</text>
         </view>
     </view>

components/yue/yongjintop/yongjintop.wxss

@@ -1,63 +1 @@
-.box {
+.box{width:690rpx;margin:0 auto;padding-bottom:41rpx;border-bottom:2rpx solid #EEEEEE}.box .yongjintop{width:152rpx;height:196rpx;margin:0 auto;margin-top:40rpx}.box .yongjintop .photo{width:130rpx;height:130rpx;background-color:gold;margin-bottom:24rpx;border-radius:90%}.box .yongjintop .tel{color:#333333;font-size:28rpx;text-align:center}.mid{width:100%;height:175rpx;border-bottom:20rpx solid #FBFBFB;color:#333333;font-size:28rpx;text-align:center}.mid .midbox{width:478rpx;height:175rpx;display:flex;justify-content:space-between;margin:0 auto}.mid .way{margin-top:46rpx;margin-bottom:14rpx}.mid .money{font-size:24rpx}.mid .money1{color:#F81F1F}.mid .line{width:2rpx;height:60rpx;margin:auto 0;background-color:#EEEEEE}
-  width: 690rpx;
-  margin: 0 auto;
-  padding-bottom: 41rpx;
-  border-bottom: 2rpx solid #EEEEEE;
-}
-
-.box .yongjintop {
-  width: 152rpx;
-  height: 196rpx;
-  margin: 0 auto;
-  margin-top: 40rpx;
-}
-
-.box .yongjintop .photo {
-  width: 130rpx;
-  height: 130rpx;
-  background-color: gold;
-  margin-bottom: 44rpx;
-  border-radius: 90%;
-}
-
-.box .yongjintop .tel {
-  color: #333333;
-  font-size: 28rpx;
-}
-
-.mid {
-  width: 100%;
-  height: 175rpx;
-  border-bottom: 20rpx solid #FBFBFB;
-  color: #333333;
-  font-size: 28rpx;
-  text-align: center;
-}
-
-.mid .midbox {
-  width: 478rpx;
-  height: 175rpx;
-  display: flex;
-  justify-content: space-between;
-  margin: 0 auto;
-}
-
-.mid .way {
-  margin-top: 46rpx;
-  margin-bottom: 14rpx;
-}
-
-.mid .money {
-  font-size: 24rpx;
-}
-
-.mid .money1 {
-  color: #F81F1F;
-}
-
-.mid .line {
-  width: 2rpx;
-  height: 60rpx;
-  margin: auto 0;
-  background-color: #EEEEEE;
-}

components/yue/yuedetail/yuedetail.js

@@ -4,7 +4,9 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    money:String,
+    date:String,
+    time:String
   },
 
   /**

components/yue/yuedetail/yuedetail.wxml

@@ -1,7 +1,7 @@
 <view class="yuedetail">
     <view class="left">
-        <view class="date">2017-02-21</view>
+        <view class="date">{{date}}</view>
-        <view class="time">17:23:25</view>
+        <view class="time">{{time}}</view>
     </view>
-    <view class="right">-1234.00</view>
+    <view class="right">{{money}}</view>
 </view>

components/yue/yuetitle/yuetitle.wxml

@@ -1,3 +1,3 @@
 <view class="yuetitle">
-    累计消费
+    资产记录
 </view>

components/yue/yuetop/yuetop.js

@@ -4,7 +4,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    money:String
   },
 
   /**
@@ -18,6 +18,9 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    recharge(){
+      console.log(234)
+      this.triggerEvent('recharge')
+    }
   }
 })

components/yue/yuetop/yuetop.wxml

@@ -1,7 +1,7 @@
 <view class="yuetop">
     <view class="all">总资产</view>
     <view class="money">
-        <text>615.96</text>
+        <text>{{money}}</text>
-        <text class="chong">充值</text>
+        <text class="chong" bind:tap="recharge">充值</text>
     </view>
 </view>

pages/accomplish/accomplish.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarTitleText": "订单详情",
   "usingComponents": {
     "content":"../components/particulars/content/index",
     "orderchooseaddr":"../components/particulars/orderchooseaddr/index",

pages/addaddress/addaddress.js

@@ -164,7 +164,7 @@ Page({
         }).then((res)=>{
             // console.log(res)
                 this.setData({
-                    arealist1:res.data.result,
+                    // arealist1:res.data.result,
                     tagDis:[false,false,false],
                     active:1
                 })
@@ -226,6 +226,13 @@ Page({
                 }
             }).then((res)=>{
                 console.log(res)
+                wx.showToast({
+                    title:res.data.msg,
+                    icon:"none"
+                })
+                wx.navigateBack({
+                    delta:1
+                })
             })
         })
      

pages/addaddress/addaddress.json

@@ -1,4 +1,5 @@
 {
+    "navigationBarTitleText": "添加地址",
     "usingComponents": {
         "shuru": "/components/addaddress/shuru/shuru",
         "addradd": "/components/chooseaddr/addradd/addradd",

pages/addaddress/addaddress.wxml

@@ -7,7 +7,7 @@
   <!-- <picker bindchange="bindPickerChange" value="{{item.item_id?item.item_id:0}}" range="{{info.goods.goods_spec_list?info.goods.goods_spec_list:['默认规格']}}">
    <shuru left="城市信息" right="北京市 北京市 东城区" ifarrow="{{true}}" data-no="3"></shuru>
   </picker> -->
-  <view bindtap="showPopup">
+  <view bindtap="showPopup" wx:if="{{nowcountry == '中国'}}">
     <shuru left="城市信息" right="{{addressCity}}" ifarrow="{{true}}" data-no="3"></shuru>
   </view>
   <van-popup show="{{ show }}" position="bottom" bind:close="onClose" >

pages/chooseaddr/chooseaddr.js

@@ -1,5 +1,5 @@
 // pages/chooseaddr/chooseaddr.js
-import { request } from "../../utils/bin"
+import { request,getuserid } from "../../utils/bin"
 Page({
 
     /**
@@ -36,9 +36,20 @@ Page({
       
     },
     add() {
+        getuserid().then((id)=>{
+            if(id == 0){
+                wx.showToast({
+                    title: '请先登陆',
+                    icon: 'none',
+                    duration: 2000
+                  })
+            }else{
                 wx.navigateTo({
                     url: "/pages/addaddress/addaddress"
                 })
+            }
+        })
+        
     },
     // user_id/8/id/215
     delete(e){
@@ -124,7 +135,7 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function() {
-
+        this.onLoad()
     },
 
     /**

pages/chooseaddr/chooseaddr.json

@@ -1,4 +1,5 @@
 {
+    "navigationBarTitleText": "地址",
     "usingComponents": {
         "address": "/components/chooseaddr/address/address",
         "addradd": "/components/chooseaddr/addradd/addradd"

pages/chooseaddr/chooseaddr.wxss

@@ -1,13 +1 @@
-.chooseaddress .box {
+.chooseaddress .box{height:910rpx}.chooseaddress .addr{margin-left:30rpx}.chooseaddress .btn1{position:fixed;bottom:149rpx;left:50rpx}
-  height: 910rpx;
-}
-
-.chooseaddress .addr {
-  margin-left: 30rpx;
-}
-
-.chooseaddress .btn1 {
-  position: fixed;
-  bottom: 149rpx;
-  left: 50rpx;
-}

pages/classify/classify.js

@@ -14,19 +14,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function(options) {
-        request({
+       
-            url: "Goods/goodsCategoryList",
-            data: {
-                parent_id: 2
-            }
-        }).then((res) => {
-            // console.log(res)
-            this.setData({
-                type: res.data.result
-            })
-            this.select({detail:{id:res.data.result[0].id}})
-            console.log(this.data.type, 150)
-        })
 
     },
     select(a){
@@ -35,7 +23,7 @@ Page({
         request({
             url:'Goods/goodsList',
             urldata:{
-                id:a.detail.id,
+                cat_id:a.detail.id,
                 sort:'shop_price',
                 sort_asc:'desc',
                 p:0
@@ -58,7 +46,20 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function() {
+        request({
+            url: "Goods/goodsCategoryList",
+            data: {
+                parent_id: 2
+            }
             
+        }).then((res) => {
+            // console.log(res)
+            this.setData({
+                type: res.data.result
+            })
+            this.select({detail:{id:res.data.result[0].id}})
+            console.log(this.data.type, 150)
+        })
     },
 
     /**

pages/classify/classify.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarTitleText": "分类",
   "usingComponents": {
     "list":"../components/classify/list/index",
     "navigation":"../components/classify/navigation/index"

pages/classify/classify.wxml

@@ -1,4 +1,4 @@
 <view class="box">
-<navigation bindselect="select" types="{{type}}"></navigation>
+<navigation bindselect="select" types="{{type}}" ids="{{type[0].id}}"></navigation>
 <list list="{{list}}"></list>
 </view>

pages/commission/commission.js

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

pages/commission/commission.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "yuedetail": "/components/yue/yuedetail/yuedetail"
+
+  }
+}