k.zhang 3 năm trước cách đây
mục cha
commit
cd0f9a59d5
58 tập tin đã thay đổi với 1468 bổ sung74 xóa
  1. 3 1
      app.json
  2. 1 0
      dist/checkbox-group/index.js
  3. 1 0
      dist/checkbox-group/index.json
  4. 4 0
      dist/checkbox-group/index.wxml
  5. 1 0
      dist/checkbox-group/index.wxss
  6. 1 0
      dist/checkbox/index.js
  7. 1 0
      dist/checkbox/index.json
  8. 7 0
      dist/checkbox/index.wxml
  9. 1 0
      dist/checkbox/index.wxss
  10. 1 0
      dist/form-item/index.js
  11. 1 0
      dist/form-item/index.json
  12. 14 0
      dist/form-item/index.wxml
  13. 1 0
      dist/form-item/index.wxss
  14. 1 0
      dist/form/index.js
  15. 1 0
      dist/form/index.json
  16. 14 0
      dist/form/index.wxml
  17. 0 0
      dist/form/index.wxss
  18. 1 0
      dist/mask/index.js
  19. 1 0
      dist/mask/index.json
  20. 7 0
      dist/mask/index.wxml
  21. 1 0
      dist/mask/index.wxss
  22. 1 0
      dist/message/index.js
  23. 1 0
      dist/message/index.json
  24. 10 0
      dist/message/index.wxml
  25. 1 0
      dist/message/index.wxss
  26. 1 0
      dist/radio-group/index.js
  27. 1 0
      dist/radio-group/index.json
  28. 4 0
      dist/radio-group/index.wxml
  29. 1 0
      dist/radio-group/index.wxss
  30. 1 0
      dist/radio/index.js
  31. 1 0
      dist/radio/index.json
  32. 7 0
      dist/radio/index.wxml
  33. 1 0
      dist/radio/index.wxss
  34. 1 0
      dist/rate/index.js
  35. 1 0
      dist/rate/index.json
  36. 10 0
      dist/rate/index.wxml
  37. 1 0
      dist/rate/index.wxss
  38. 1 0
      dist/textarea/index.js
  39. 1 0
      dist/textarea/index.json
  40. 10 0
      dist/textarea/index.wxml
  41. 1 0
      dist/textarea/index.wxss
  42. 1 0
      dist/toast/index.js
  43. 1 0
      dist/toast/index.json
  44. 9 0
      dist/toast/index.wxml
  45. 1 0
      dist/toast/index.wxss
  46. 269 1
      pages/admin/admin.js
  47. 57 5
      pages/admin/admin.wxml
  48. 1 1
      pages/boutique/outique.js
  49. 122 60
      pages/index/index.js
  50. 125 0
      pages/pay/pay.js
  51. 35 0
      pages/pay/pay.json
  52. 36 0
      pages/pay/pay.wxml
  53. 19 0
      pages/pay/pay.wxss
  54. 198 0
      pages/trans/trans.js
  55. 35 0
      pages/trans/trans.json
  56. 68 0
      pages/trans/trans.wxml
  57. 359 0
      pages/trans/trans.wxss
  58. 13 6
      project.config.json

+ 3 - 1
app.json

@@ -9,7 +9,9 @@
     "pages/search-details/earch-details",
     "pages/friends/friends",
     "pages/friends-list/friends-list",
-    "pages/admin/admin"
+    "pages/admin/admin",
+    "pages/trans/trans",
+    "pages/pay/pay"
   ],
   "window": {
     "backgroundTextStyle": "light",

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/checkbox-group/index.js


+ 1 - 0
dist/checkbox-group/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-error-tip":"../error-tip/index","l-checkbox":"../checkbox/index"}}

+ 4 - 0
dist/checkbox-group/index.wxml

@@ -0,0 +1,4 @@
+<view class="l-class checkbox-group checkbox-group-{{placement}}">
+  <slot></slot> 
+</view>
+  <l-error-tip l-error-text-class="l-error-text l-error-text-class" errorText="{{errorText}}" wx:if="{{errorText}}"/>

+ 1 - 0
dist/checkbox-group/index.wxss

@@ -0,0 +1 @@
+.checkbox-group{flex-wrap:wrap}.checkbox-group-row{display:flex;flex-direction:row}.checkbox-group-column{display:flex;flex-direction:column}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/checkbox/index.js


+ 1 - 0
dist/checkbox/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-button":"../button/index"}}

+ 7 - 0
dist/checkbox/index.wxml

@@ -0,0 +1,7 @@
+<view mut-bind:lintap="onCheckboxChangeTap" mut-bind:tap="onCheckboxChangeTap" class="label label-{{placement}} label-placement-{{parentPlacement}} {{disabled ? 'label-disabled l-disabled-class' : 'l-class'}}">
+        <view class="checkbox-{{placement}} l-icon-class" style="color:{{checked ? selectColor : (disabled ? disabledColor : color)}};font-size: {{size}}">
+            <slot wx:if="{{custom}}" name="icon"/>
+            <view wx:else class="iconfont {{checked? 'icon-select': 'icon-unselect'}}"></view>
+        </view>
+        <slot/>
+</view>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/checkbox/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/form-item/index.js


+ 1 - 0
dist/form-item/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-error-tip":"../error-tip/index"}}

+ 14 - 0
dist/form-item/index.wxml

@@ -0,0 +1,14 @@
+<view class="l-form-item-class form-item-container {{'label-' + labelPlacement}} {{tipType === 'text' ? 'textHeight': ''}}">
+    <view class="l-form-label-class label-text {{isRequired ? 'label-text-required': ''}} {{'label-text-' + labelPlacement+ '-' + alignItems}}" style="min-width: {{labelPlacement==='row' ? labelWidth : '100%'}};max-width: {{labelPlacement==='row' ? labelWidth : '100%'}}">
+        <view wx:if="{{labelSlot}}">
+            <slot name="label"/>
+        </view>
+        <view wx:else>
+            {{label}}
+        </view>
+    </view>
+    <view class="label-content l-form-content-class">
+        <slot/>
+    </view>
+    <l-error-tip class="error-text" l-error-text-class="l-error-text-class" errorText="{{errorText}}" wx:if="{{errorText}}"/>
+</view>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/form-item/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/form/index.js


+ 1 - 0
dist/form/index.json

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

+ 14 - 0
dist/form/index.wxml

@@ -0,0 +1,14 @@
+<view class="l-form-container-class">
+    <slot/>
+</view>
+<view class="l-form-btn-class">
+    <slot name="submit-front"/>
+    <view class="l-form-submit-class" capture-bind:tap="submit">
+        <slot name="submit"/>
+    </view>
+    <slot name="reset-front"/>
+    <view class="l-form-reset-class" capture-bind:tap="reset">
+        <slot name="reset"/>
+    </view>
+    <slot name="reset-behind"/>
+</view>

+ 0 - 0
dist/form/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/mask/index.js


+ 1 - 0
dist/mask/index.json

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

+ 7 - 0
dist/mask/index.wxml

@@ -0,0 +1,7 @@
+
+<view class="container-mask {{center? 'center' : ''}} l-class" hidden="{{ show? '' :  'hidden'}}" catchtouchmove="doNothingMove" catchtap="onMaskTap" style="z-index:{{zIndex}}; {{show? 'background: rgba(0,0,0,' + opacity+ ')' :  ''}}">
+  
+  <view class="mask-content l-mask-class">
+    <slot></slot>
+  </view>
+</view>

+ 1 - 0
dist/mask/index.wxss

@@ -0,0 +1 @@
+.container-mask{position:fixed;top:0;left:0;width:100%;height:100%;transition:all .3s}.mask-bg{height:100%;width:100%;background:#fff;z-index:99}.mask-content{display:inline-block;z-index:101;overflow:hidden}.center{display:flex;flex-direction:row;align-items:center;justify-content:center}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/message/index.js


+ 1 - 0
dist/message/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-icon":"../icon/index"}}

+ 10 - 0
dist/message/index.wxml

@@ -0,0 +1,10 @@
+<view class="l-message l-class {{'l-message-'+type}} {{status?'l-message-show':''}}" style="z-index:{{zIndex}};top:{{top}}rpx">
+  <block wx:if="{{status}}">
+    <view style="margin-right:15rpx">
+      <l-icon name="{{icon?icon:type}}" size="{{iconSize}}" color="{{type==='warning'?'#333':iconColor}}"/>
+    </view>
+    <image wx:if="{{image}}" src="{{image}}" class="l-message-image l-class-image l-image-class"/>
+    {{content}}
+    <slot/>
+  </block>
+</view>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/message/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/radio-group/index.js


+ 1 - 0
dist/radio-group/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-error-tip":"../error-tip/index","l-radio":"../radio/index"}}

+ 4 - 0
dist/radio-group/index.wxml

@@ -0,0 +1,4 @@
+<view class="l-class radio-group radio-group-{{placement}}">
+    <slot></slot>
+</view>
+<l-error-tip l-error-text-class="l-error-text l-error-text-class" errorText="{{errorText}}" wx:if="{{errorText}}"/>

+ 1 - 0
dist/radio-group/index.wxss

@@ -0,0 +1 @@
+.radio-group{width:100%}.radio-group-row{display:flex;flex-direction:row}.radio-group-column{display:flex;flex-direction:column}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/radio/index.js


+ 1 - 0
dist/radio/index.json

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

+ 7 - 0
dist/radio/index.wxml

@@ -0,0 +1,7 @@
+<view mut-bind:tap="onRadioChangeTap" class="label label-{{placement}} {{disabled?'label-disabled l-disabled-class':'l-class'}}">
+        <view class="radio" style="color:{{checked?selectColor:(disabled?disabledColor:color)}};font-size:{{size}}">
+            <slot wx:if="{{custom}}" name="icon"/>
+            <view wx:else class="iconfont {{checked?'icon-select':'icon-unselect'}}"></view>
+        </view>
+        <slot/>
+</view>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/radio/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/rate/index.js


+ 1 - 0
dist/rate/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-icon":"../icon/index"}  }

+ 10 - 0
dist/rate/index.wxml

@@ -0,0 +1,10 @@
+<view class="l-rate l-class">
+    <view style="{{itemGap&&index!=0?'margin-left:'+itemGap+'rpx':''}}" wx:for="{{count}}" wx:key="item" class="l-rate-star" data-index="{{index}}" mut-bind:tap="handleClick">
+        <view class="icon-checked" wx:if="{{score > index}}" hover-class="none" hover-stop-propagation="false" data-rate="{{score-index}}" style="width:{{score-index<1?(score-index)*100:100}}%">
+            <image wx:if="{{activeImage &&  inActiveImage}}" class="image-item l-class-image l-image-class" src="{{activeImage}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+            <l-icon wx:else name="{{name}}" l-class="l-class-icon l-icon-class" size="{{size}}" color="{{activeColor}}"/>
+        </view>
+        <image wx:if="{{activeImage &&  inActiveImage}}" class="image-item l-class-image l-image-class" src="{{inActiveImage}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+        <l-icon wx:else name="{{name}}" l-class="l-class-icon l-icon-class" size="{{size}}" color="{{inActiveColor}}"></l-icon>
+    </view>
+</view>

+ 1 - 0
dist/rate/index.wxss

@@ -0,0 +1 @@
+.l-rate,.l-rate-star{display:inline-flex}.l-rate-star{position:relative}.icon-checked{position:absolute;overflow:hidden;display:flex}.image-item{width:80rpx;height:80rpx}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/textarea/index.js


+ 1 - 0
dist/textarea/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-icon":"../icon/index","l-error-tip":"../error-tip/index"}}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 10 - 0
dist/textarea/index.wxml


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/textarea/index.wxss


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/toast/index.js


+ 1 - 0
dist/toast/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-icon":"../icon/index","l-mask":"../mask/index"}}

+ 9 - 0
dist/toast/index.wxml

@@ -0,0 +1,9 @@
+<view class="container {{mask?'containerShowMask':'containerNoMask'}}" hidden="{{!status}}" style="z-index:{{zIndex}}">
+  <view class="l-bg-class toast-bg" wx:if="{{mask}}"></view>
+  <view class="l-class toast toast-{{placement || 'bottom'}}" style="padding-top:{{(placement  || 'bottom')=== 'bottom' ?  image || icon ? '25rpx': '': ''}};position:relative;left:{{offsetX}}rpx;top:{{offsetY}}rpx;margin-bottom:{{distance}}px">
+    <image class="l-image-class toast-icon" wx:if="{{image}}" src="{{image}}"/>
+    <l-icon l-class="l-icon-class toast-icon toast-icon-{{icon === 'loading'?'loading':''}}" wx:elif="{{icon && !image}}" size="{{iconSize? iconSize : 60}}" color="{{iconColor? iconColor: icon === 'success'? '#00C292' :  icon === 'error' ? '#F4516C' : '#ffffff'}}" name="{{icon}}"/>
+    <slot wx:else/>
+    <text class="toast-text l-title-class toast-text-{{placement}}" style="{{placement || 'bottom' === 'bottom' ? icon || image? 'margin-top:10rpx' : '': '' }}">{{ title }}</text>
+  </view>
+</view>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
dist/toast/index.wxss


+ 269 - 1
pages/admin/admin.js

@@ -38,7 +38,10 @@ Page({
         console.log(res)
        
         that.setData({
-          wallet: res.data.data
+          wallet: res.data.data,
+          order:true,
+          trans:false,
+          adminTrans:false
          })
         
       }
@@ -78,10 +81,275 @@ Page({
  
       } 
      }) 
+     var opneId = wx.getStorageSync('openId')
+     wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/open.id/get"
+      }, 
+      method: "POST",
+      data:  { openId: opneId }, 
+      success (res) {
+        console.log(res)
+       
+        wx.setStorageSync('nickName', res.data.data.user.nickName)  
+        wx.setStorageSync('userId', res.data.data.user.id) 
+        if (res.data.data.user.admin == 2){
+          that.setData({
+            admin:true
+           })
+        }
+        
+      }
+     }) 
 
 
   },
+  copy:function (options) {
+    console.log(options)
+    wx.setClipboardData({
+      data: options.currentTarget.dataset.pay,
+      success (res) {
+      //点击确定
+      wx.showToast({
+        title: '复制成功',//提示文字
+        duration:2000,//显示时长
+        mask:true,//是否显示透明蒙层,防止触摸穿透,默认:false  
+        icon:'success', //图标,支持"success"、"loading"  
+        success:function(){ },//接口调用成功
+        fail: function () { },  //接口调用失败的回调函数  
+        complete: function () { } //接口调用结束的回调函数  
+     })
+      }
+    })
+   
+  },
+  statusFail:function (options) {
+    console.log(options)
+    var that = this
+    var item = options.target.dataset.item
+    wx.showModal({
+      title: '拒绝提现',
+      content: '金额等数据异常,拒绝发放提现',
+      showCancel: true,//是否显示取消按钮
+      cancelText:"取消",//默认是“取消”
+      confirmText:"确定",//默认是“确定”
+      
+      success: function (res) {
+         if (res.cancel) {
+            //点击取消,默认隐藏弹框
+         } else {
+          wx.request( { 
+            url: link + "/v1/forward/lhf", 
+            header: { 
+             "Content-Type": "application/json",
+             "function":"/v1/user/trans/update"
+            }, 
+            method: "POST",
+            data:  { pidStatus: item.pid_status,pay:item.pay,userId:item.userId,payName:item.payName,pid:item.pid,openId:item.openId,transStatus:2,id:item.id }, 
+            success (res) {
+              console.log(res)
+              wx.request( { 
+                url: link + "/v1/forward/lhf", 
+                header: { 
+                 "Content-Type": "application/json",
+                 "function":"/v1/user/trans/list"
+                }, 
+                method: "POST",
+                data:  { pageIndex:1,pageSize:999 }, 
+                complete: function( res ) { 
+                 console.log(res)
+                 if( res == null || res.data == null ) { 
+                  console.error( '网络请求失败' ); 
+                  return; 
+                 } 
+                
+                 that.setData({
+                  transList: res.data.data.rows,
+                  order:false,
+                  trans:true,
+                  adminTrans:false
+                 })
+               
+          
+          
+                } 
+               }) 
+            }
+           })
+
+         }
+      },
+      fail: function (res) { },//接口调用失败的回调函数
+      complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行)
+   })
+  },
+  statusSuccess:function (options) {
+    console.log(options)
+    var that = this
+    var item = options.target.dataset.item
+    wx.showModal({
+      title: '提现已发放',
+      content: '金额已发放',
+      showCancel: true,//是否显示取消按钮
+      cancelText:"取消",//默认是“取消”
+      confirmText:"确定",//默认是“确定”
+      
+      success: function (res) {
+         if (res.cancel) {
+            //点击取消,默认隐藏弹框
+         } else {
+          wx.request( { 
+            url: link + "/v1/forward/lhf", 
+            header: { 
+             "Content-Type": "application/json",
+             "function":"/v1/user/trans/update"
+            }, 
+            method: "POST",
+            data:  { pidStatus: item.pid_status,pay:item.pay,userId:item.userId,payName:item.payName,pid:item.pid,openId:item.openId,transStatus:3,id:item.id }, 
+            success (res) {
+              console.log(res)
+              wx.request( { 
+                url: link + "/v1/forward/lhf", 
+                header: { 
+                 "Content-Type": "application/json",
+                 "function":"/v1/user/trans/list"
+                }, 
+                method: "POST",
+                data:  { pageIndex:1,pageSize:999 }, 
+                complete: function( res ) { 
+                 console.log(res)
+                 if( res == null || res.data == null ) { 
+                  console.error( '网络请求失败' ); 
+                  return; 
+                 } 
+                
+                 that.setData({
+                  transList: res.data.data.rows,
+                  order:false,
+                  trans:true,
+                  adminTrans:false
+                 })
+               
+          
+          
+                } 
+               }) 
+            }
+           })
+
+         }
+      },
+      fail: function (res) { },//接口调用失败的回调函数
+      complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行)
+   })
+  },
+
+  changeTabs:function(options){
+    console.log(options)
+    var that = this
+    if (options.detail.activeKey == "one"){
+      //查询数据
 
+      that.setData({
+        order:true,
+        trans:false,
+        adminTrans:false
+       })
+    } else if (options.detail.activeKey == "two"){
+      //查询提现数据
+      wx.request( { 
+        url: link + "/v1/forward/lhf", 
+        header: { 
+         "Content-Type": "application/json",
+         "function":"/v1/user/trans/list"
+        }, 
+        method: "POST",
+        data:  { pageIndex:1,pageSize:999 }, 
+        complete: function( res ) { 
+         console.log(res)
+         if( res == null || res.data == null ) { 
+          console.error( '网络请求失败' ); 
+          return; 
+         } 
+        
+         that.setData({
+          transList: res.data.data.rows,
+          order:false,
+          trans:true,
+          adminTrans:false
+         })
+       
+  
+  
+        } 
+       }) 
+
+    } else if (options.detail.activeKey == "three"){
+      wx.request( { 
+        url: link + "/v1/forward/lhf", 
+        header: { 
+         "Content-Type": "application/json",
+         "function":"/v1/admin/amount/list"
+        }, 
+        method: "POST",
+        data:  { pageIndex:1,pageSize:999 }, 
+        complete: function( res ) { 
+         console.log(res)
+         if( res == null || res.data == null ) { 
+          console.error( '网络请求失败' ); 
+          return; 
+         } 
+        
+         that.setData({
+          adminTransList: res.data.data.rows,
+          order:false,
+          trans:false,
+          adminTrans:true
+         })
+       
+  
+  
+        } 
+       }) 
+    }
+  },
+  adminAmount:function (options) {
+    var that = this
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/admin/amount"
+      }, 
+      method: "POST",
+      data:  {  }, 
+      success (res) {
+        console.log(res)
+        wx.request( { 
+          url: link + "/v1/forward/lhf", 
+          header: { 
+           "Content-Type": "application/json",
+           "function":"/v1/admin/data"
+          }, 
+          method: "POST",
+          data:  { openId: "" }, 
+          success (res) {
+            console.log(res)
+           
+            that.setData({
+              wallet: res.data.data,
+             })
+            
+          }
+         })
+      }
+     })
+  },
+  trans:function(){
+    console.log('trans')
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

+ 57 - 5
pages/admin/admin.wxml

@@ -19,18 +19,28 @@
             <view class="text">平台佣金预估</view>
           </l-grid-item>
           <l-grid-item key="five" slot="five">
-            <view class="num">{{wallet.adminAmountSel}}</view>
-            <view class="text">管理员结算佣金</view>
+            <view class="num">{{wallet.availableAmount}}</view>
+            <view class="text">平台待结算佣金</view>
           </l-grid-item>
           <l-grid-item key="six" slot="six">
-            <view class="num">{{wallet.platformAmountSel}}</view>
-            <view class="text">平台结算佣金</view>
+            <view class="num">{{wallet.withdrawalAmount}}</view>
+            <view class="text">平台结算佣金</view>
           </l-grid-item>
         </l-grid>
       </view>
     </content-card>
 
-  <view wx:for="{{goodsList}}" wx:key="msg">
+    <content-card class="content" name="管理员提现" wx:if="{{admin}}">
+     <button bindtap="adminAmount">管理员提现</button>
+    </content-card>
+
+    <l-segment bind:linchange="changeTabs">
+        <l-segment-item tab="订单" key="one" />
+        <l-segment-item tab="提现" key="two"/>
+        <l-segment-item tab="管理员提现" key="three"/>
+    </l-segment>
+
+  <view wx:for="{{goodsList}}" wx:key="msg"  wx:if="{{order}}">
   <l-card  type="primary" l-img-class="right-card" position="left" image="{{item.order.goodsThumbnailUrl}}"
   bindtap="goodsDetail"  data-sign="{{item.goods_sign}}" data-searchId="{{item.search_id}}"   full="true" >
 
@@ -57,6 +67,48 @@
    </text> -->
    
   <text class="contentcard">创建时间:{{item.order.orderCreateTime}}</text>
+  </l-card>
+</view>
+
+<view wx:for="{{transList}}" wx:key="msg"  wx:if="{{trans}}">
+  <l-card  type="primary" l-img-class="right-card"  plaintext="true"  full="true"   full="true" >
+
+    <view class="containertag">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe" >提现编号:{{item.id}}</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli">¥:{{(item.amount)}}</l-tag>
+     
+    </view>
+
+    <view class="containertag">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe" >用户编号:{{item.userId}}</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli" bindtap="copy"  data-pay="{{item.pay}}">{{item.payName}}提款:{{item.pay}}</l-tag>
+     
+    </view>
+    <view class="containertag">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe" >申请日期:{{item.createTime}}</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli" >提现状态:{{item.transStatus == 1 ? '审核中' : item.transStatus == 2 ? '审核失败' : '提现成功' }}</l-tag>
+     
+    </view>
+    <view class="containertag" wx:if="{{item.transStatus == 1}}">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe"  bindtap="statusFail"  data-item="{{item}}">审核失败</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli" bindtap="statusSuccess"  data-item="{{item}}">提现成功</l-tag>
+    </view>
+ 
+  </l-card>
+</view>
+
+<view wx:for="{{adminTransList}}" wx:key="msg"  wx:if="{{adminTrans}}">
+  <l-card  type="primary" l-img-class="right-card"  plaintext="true"  full="true"   full="true" >
+
+    <view class="containertag">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe" >提现时间:{{item.create_time}}</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli">¥:{{(item.amount)}}</l-tag>
+    </view>
+
+    
+   
+  
+ 
   </l-card>
 </view>
 

+ 1 - 1
pages/boutique/outique.js

@@ -117,7 +117,7 @@ Page({
        "function":"/v1/set"
       }, 
       method: "POST",
-      data:  { version: "1.0.5" }, 
+      data:  { version: "1.0.6" }, 
       complete: function( res ) { 
        console.log(res)
        if( res == null || res.data == null ) { 

+ 122 - 60
pages/index/index.js

@@ -104,65 +104,65 @@ Page({
     })
   },
   onLoad() {
-    var that = this
-    var opneId = wx.getStorageSync('openId')
-    var nickName = wx.getStorageSync('nickName')
-    //var admin = wx.getStorageSync('admin')
-    if (wx.getUserProfile) {
-      this.setData({
-        canIUseGetUserProfile: true
-      })
-    }
-    //获取金额
-    wx.request( { 
-      url: link + "/v1/forward/lhf", 
-      header: { 
-       "Content-Type": "application/json",
-       "function":"/v1/user/wallet/get"
-      }, 
-      method: "POST",
-      data:  { openId: opneId }, 
-      success (res) {
-        console.log(res)
+    // var that = this
+    // var opneId = wx.getStorageSync('openId')
+    // var nickName = wx.getStorageSync('nickName')
+    // //var admin = wx.getStorageSync('admin')
+    // if (wx.getUserProfile) {
+    //   this.setData({
+    //     canIUseGetUserProfile: true
+    //   })
+    // }
+    // //获取金额
+    // wx.request( { 
+    //   url: link + "/v1/forward/lhf", 
+    //   header: { 
+    //    "Content-Type": "application/json",
+    //    "function":"/v1/user/wallet/get"
+    //   }, 
+    //   method: "POST",
+    //   data:  { openId: opneId }, 
+    //   success (res) {
+    //     console.log(res)
        
-        that.setData({
-          wallet: res.data.data.wallet
-         })
+    //     that.setData({
+    //       wallet: res.data.data.wallet
+    //      })
         
-      }
-     }) 
+    //   }
+    //  }) 
      
-     console.log(nickName)
-    //  if (nickName == '' ){
-      wx.request( { 
-        url: link + "/v1/forward/lhf", 
-        header: { 
-         "Content-Type": "application/json",
-         "function":"/v1/user/open.id/get"
-        }, 
-        method: "POST",
-        data:  { openId: opneId }, 
-        success (res) {
-          console.log(res)
-          var admin = false
-          wx.setStorageSync('nickName', res.data.data.user.nickName)  
-          wx.setStorageSync('userId', res.data.data.user.id) 
-          if (res.data.data.user.admin == 1){
-            admin = true
-          }
-          that.setData({
-            userId: res.data.data.user.id,
-            admin:admin
-           })
-        }
-       }) 
-    // } else{
-    //   var userId = wx.getStorageSync('userId')
-    //   console.log(userId)
-    //   that.setData({
-    //     userId: userId
-    //    })
-    // }
+    //  console.log(nickName)
+    // //  if (nickName == '' ){
+    //   wx.request( { 
+    //     url: link + "/v1/forward/lhf", 
+    //     header: { 
+    //      "Content-Type": "application/json",
+    //      "function":"/v1/user/open.id/get"
+    //     }, 
+    //     method: "POST",
+    //     data:  { openId: opneId }, 
+    //     success (res) {
+    //       console.log(res)
+    //       var admin = false
+    //       wx.setStorageSync('nickName', res.data.data.user.nickName)  
+    //       wx.setStorageSync('userId', res.data.data.user.id) 
+    //       if (res.data.data.user.admin == 1){
+    //         admin = true
+    //       }
+    //       that.setData({
+    //         userId: res.data.data.user.id,
+    //         admin:admin
+    //        })
+    //     }
+    //    }) 
+    // // } else{
+    // //   var userId = wx.getStorageSync('userId')
+    // //   console.log(userId)
+    // //   that.setData({
+    // //     userId: userId
+    // //    })
+    // // }
 
 
   },
@@ -211,10 +211,13 @@ Page({
 
     }
      else if (e.detail.cell.text == "提现") {
-      wx.showToast({
-        title: "结算金额:0元",
-        icon: 'none'
-      });
+      // wx.showToast({
+      //   title: "结算金额:0元",
+      //   icon: 'none'
+      // });
+      wx.navigateTo({
+        url:"/pages/trans/trans"
+      })
 
     } else if (e.detail.cell.text == "邀请好友"){
       console.log('邀请好友')
@@ -285,6 +288,63 @@ Page({
       hasUserInfo: true
     })
   },
+  onShow:function (e) {
+    
+    var that = this
+    var opneId = wx.getStorageSync('openId')
+    var nickName = wx.getStorageSync('nickName')
+    //var admin = wx.getStorageSync('admin')
+    if (wx.getUserProfile) {
+      this.setData({
+        canIUseGetUserProfile: true
+      })
+    }
+    //获取金额
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/wallet/get"
+      }, 
+      method: "POST",
+      data:  { openId: opneId }, 
+      success (res) {
+        console.log(res)
+       
+        that.setData({
+          wallet: res.data.data.wallet
+         })
+        
+      }
+     }) 
+     
+     console.log(nickName)
+    //  if (nickName == '' ){
+      wx.request( { 
+        url: link + "/v1/forward/lhf", 
+        header: { 
+         "Content-Type": "application/json",
+         "function":"/v1/user/open.id/get"
+        }, 
+        method: "POST",
+        data:  { openId: opneId }, 
+        success (res) {
+          console.log(res)
+          var admin = false
+          wx.setStorageSync('nickName', res.data.data.user.nickName)  
+          wx.setStorageSync('userId', res.data.data.user.id) 
+          if (res.data.data.user.admin >= 1){
+            admin = true
+          }
+          that.setData({
+            userId: res.data.data.user.id,
+            admin:admin
+           })
+        }
+       }) 
+    
+
+  }
   /**
    * 用户点击右上角分享
    */
@@ -297,3 +357,5 @@ Page({
   //    }
   // }
 })
+
+

+ 125 - 0
pages/pay/pay.js

@@ -0,0 +1,125 @@
+// pages/pay/pay.js
+const app = getApp()
+const link = app.globalData.url
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pickerHidden: true,
+    chosen: ''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  pickerConfirm(e) {
+    this.setData({
+      pickerHidden: true
+    })
+    this.setData({
+      chosen: e.detail.value
+    })
+  },
+
+  pickerCancel() {
+    this.setData({
+      pickerHidden: true
+    })
+  },
+
+  pickerShow() {
+    this.setData({
+      pickerHidden: false
+    })
+  },
+
+  formSubmit(e) {
+    console.log('form发生了submit事件,携带数据为:', e.detail.value)
+    var that = this
+    var opneId = wx.getStorageSync('openId')
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/user/pay"
+      }, 
+      method: "POST",
+      data:  { openId: opneId,wxPay: e.detail.value.wx,aliPay:e.detail.value.ali}, 
+      success (res) {
+        console.log(res)
+       if (res.data.code == 200){
+        wx.navigateTo({
+          url:"/pages/trans/trans"
+        })
+       }
+        
+      }
+     })
+  },
+
+  formReset(e) {
+    console.log('form发生了reset事件,携带数据为:', e.detail.value)
+    this.setData({
+      chosen: ''
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  tijiao:function (e) {
+    console.log(e)
+  }
+})

+ 35 - 0
pages/pay/pay.json

@@ -0,0 +1,35 @@
+{
+ 
+  "usingComponents": {
+    "l-avatar": "/dist/avatar/index",
+    "l-grid-item": "/dist/grid-item/index",
+    "l-grid": "/dist/grid/index",
+    "l-search-bar": "/dist/search-bar/index",
+    "l-icon":"/dist/icon/index",
+    "content-title": "/components/content-title/index",
+    "content-card": "/components/content-card/index",
+    "l-tabs": "/dist/tabs/index",
+    "l-combined-tabs": "/dist/combined-tabs/index",
+    "l-tabpanel": "/dist/tabpanel/index",
+    "l-button":"/dist/button/index",
+    "l-segment":"/dist/segment/index",
+    "l-segment-item":"/dist/segment-item/index",
+    "l-card":"/dist/card/index",
+    "l-tag":"/dist/tag/index",
+    "l-price":"/dist/price/index",
+    "l-notice":"/dist/notice-bar/index",
+    "l-loadmore": "/dist/loadmore/index",
+    "l-form": "/dist/form/index",
+    "l-form-item": "/dist/form-item/index",
+    "l-checkbox-group": "/dist/checkbox-group/index",
+    "l-checkbox": "/dist/checkbox/index",
+    "l-toast": "/dist/toast/index",
+    "l-message": "/dist/message/index",
+    "l-input": "/dist/input/index",
+    "l-textarea": "/dist/textarea/index",
+    "l-radio-group": "/dist/radio-group/index",
+    "l-radio": "/dist/radio/index",
+    "l-rate": "/dist/rate/index"
+  },
+  "navigationBarTitleText": "设置提现账户"
+}

+ 36 - 0
pages/pay/pay.wxml

@@ -0,0 +1,36 @@
+<!--pages/pay/pay.wxml-->
+<text>编辑提款账户--支付宝与微信设置一个即可</text>
+
+
+<view class="container">
+  <view class="page-body">
+    <form catchsubmit="formSubmit" catchreset="formReset">
+
+      <view class="page-section">
+        <view class="page-section-title">微信号</view>
+        <view class="weui-cells weui-cells_after-title">
+          <view class="weui-cell weui-cell_input">
+            <view class="weui-cell__bd" style="margin: 30rpx 0" >
+              <input class="weui-input" name="wx" placeholder="请输入微信账号" />
+            </view>
+          </view>
+        </view>
+        <view class="page-section-title">支付宝</view>
+        <view class="weui-cells weui-cells_after-title">
+          <view class="weui-cell weui-cell_input">
+            <view class="weui-cell__bd" style="margin: 30rpx 0" >
+              <input class="weui-input" name="ali" placeholder="请输入支付宝账户" />
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view class="btn-area">
+        <button style="margin: 30rpx 0" type="primary" formType="submit">提交</button>
+        <!-- <button style="margin: 30rpx 0" formType="reset">重置</button> -->
+      </view>
+    </form>
+  </view>
+
+</view>
+

+ 19 - 0
pages/pay/pay.wxss

@@ -0,0 +1,19 @@
+/* pages/pay/pay.wxss */
+/* pages/components/form/pages/form.wxss */
+@import "../../lib/weui.wxss";
+.l-form-btn-class{
+  display: flex;
+  justify-content: space-around;
+  margin-top: 10rpx;
+}
+
+.tip-type{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  margin: 40rpx 0;
+}
+
+.l-input-container-class {
+  width: 100% !important;
+}

+ 198 - 0
pages/trans/trans.js

@@ -0,0 +1,198 @@
+// pages/trans/trans.js
+const app = getApp()
+const link = app.globalData.url
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    openId:"",
+    amount:"",
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+    
+    that.openId = wx.getStorageSync('openId')
+    console.log(that.openId)
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/trans/list"
+      }, 
+      method: "POST",
+      data:  { openId: that.openId,pidStatus:1,pageIndex:1,pageSize:999 }, 
+      complete: function( res ) { 
+       console.log(res)
+       if( res == null || res.data == null ) { 
+        console.error( '网络请求失败' ); 
+        return; 
+       } 
+      
+       that.setData({
+        transList: res.data.data.rows,
+       })
+     
+
+
+      } 
+     }) 
+  },
+  tixian:function (){
+    var that = this
+    wx.showModal({
+      title: '提现',
+      content: '提现金额:'+that.amount,
+      showCancel: true,//是否显示取消按钮
+      cancelText:"取消",//默认是“取消”
+      //cancelColor:'skyblue',//取消文字的颜色
+      confirmText:"提现",//默认是“确定”
+      //confirmColor: 'skyblue',//确定文字的颜色
+      success: function (res) {
+         if (res.cancel) {
+            //点击取消,默认隐藏弹框
+         } else {
+          wx.request( { 
+            url: link + "/v1/forward/lhf", 
+            header: { 
+             "Content-Type": "application/json",
+             "function":"/v1/user/trans/create"
+            }, 
+            method: "POST",
+            data:  { openId: that.openId,amount:that.amount,pidStatus:1 }, 
+            complete: function( res ) { 
+             console.log(res)
+             if( res == null || res.data == null ) { 
+              console.error( '网络请求失败' ); 
+              return; 
+             } 
+             if (res.data.code == 401){
+              wx.navigateTo({
+                url:"/pages/pay/pay"
+              })
+                return
+             }
+             that.openId = wx.getStorageSync('openId')
+    console.log(that.openId)
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/trans/get"
+      }, 
+      method: "POST",
+      data:  { openId: that.openId,pidStatus:1 }, 
+      complete: function( res ) { 
+       console.log(res)
+       if( res == null || res.data == null ) { 
+        console.error( '网络请求失败' ); 
+        return; 
+       } 
+       that.amount = res.data.data.wallet.availableAmount
+       that.setData({
+        wallet: res.data.data,
+       })
+     
+      } 
+     }) 
+             
+            } 
+           }) 
+         
+
+         }
+      },
+      fail: function (res) { },//接口调用失败的回调函数
+      complete: function (res) { },//接口调用结束的回调函数(调用成功、失败都会执行)
+   })
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  /**
+   * 编辑
+   */
+  update:function () {
+    wx.navigateTo({
+      url:"/pages/pay/pay"
+    })
+  },
+
+
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var that = this
+    
+    that.openId = wx.getStorageSync('openId')
+    console.log(that.openId)
+    wx.request( { 
+      url: link + "/v1/forward/lhf", 
+      header: { 
+       "Content-Type": "application/json",
+       "function":"/v1/user/trans/get"
+      }, 
+      method: "POST",
+      data:  { openId: that.openId,pidStatus:1 }, 
+      complete: function( res ) { 
+       console.log(res)
+       if( res == null || res.data == null ) { 
+        console.error( '网络请求失败' ); 
+        return; 
+       } 
+       that.amount = res.data.data.wallet.availableAmount
+       that.setData({
+        wallet: res.data.data,
+       })
+     
+      } 
+     }) 
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 35 - 0
pages/trans/trans.json

@@ -0,0 +1,35 @@
+{
+ 
+  "usingComponents": {
+    "l-avatar": "/dist/avatar/index",
+    "l-grid-item": "/dist/grid-item/index",
+    "l-grid": "/dist/grid/index",
+    "l-search-bar": "/dist/search-bar/index",
+    "l-icon":"/dist/icon/index",
+    "content-title": "/components/content-title/index",
+    "content-card": "/components/content-card/index",
+    "l-tabs": "/dist/tabs/index",
+    "l-combined-tabs": "/dist/combined-tabs/index",
+    "l-tabpanel": "/dist/tabpanel/index",
+    "l-button":"/dist/button/index",
+    "l-segment":"/dist/segment/index",
+    "l-segment-item":"/dist/segment-item/index",
+    "l-card":"/dist/card/index",
+    "l-tag":"/dist/tag/index",
+    "l-price":"/dist/price/index",
+    "l-notice":"/dist/notice-bar/index",
+    "l-loadmore": "/dist/loadmore/index",
+    "l-form": "/dist/form/index",
+    "l-form-item": "/dist/form-item/index",
+    "l-checkbox-group": "/dist/checkbox-group/index",
+    "l-checkbox": "/dist/checkbox/index",
+    "l-toast": "/dist/toast/index",
+    "l-message": "/dist/message/index",
+    "l-input": "/dist/input/index",
+    "l-textarea": "/dist/textarea/index",
+    "l-radio-group": "/dist/radio-group/index",
+    "l-radio": "/dist/radio/index",
+    "l-rate": "/dist/rate/index"
+  },
+  "navigationBarTitleText": "提现"
+}

+ 68 - 0
pages/trans/trans.wxml

@@ -0,0 +1,68 @@
+<!--pages/trans/trans.wxml-->
+<content-card class="content" name="提现">
+      <view class="view-container">
+        <l-grid>
+          <l-grid-item key="one" slot="one">
+            <view class="num">{{wallet.wallet.availableAmount}}</view>
+            <!-- <button style="width:6vw" >提现</button> -->
+            <l-tag size="mini"  height="45" shape="circle" bindtap="tixian">提现</l-tag>
+            <!-- <view class="text">待提现金额</view> -->
+          </l-grid-item>
+          <l-grid-item key="two" slot="two">
+            <view class="num">{{wallet.reviewAmount}}</view>
+            <view class="text">审核中金额</view>
+            <!-- <l-tag size="mini"  height="40" plain="{{true}}" shape="circle">审核中金额</l-tag> -->
+          </l-grid-item>
+          <l-grid-item key="three" slot="three">
+            <view class="num">{{wallet.completedAmount}}</view>
+            <!-- <l-tag size="mini"  height="40" plain="{{true}}" shape="circle">已提现金额</l-tag> -->
+            <view class="text">已提现金额</view>
+          </l-grid-item>
+        </l-grid>
+      </view>
+    </content-card>
+
+
+ 
+
+    <content-card class="content" name="提现账户">
+            <view >
+                <view class="list-title">
+                    <view class="text" >点击编辑填写提现账户</view>
+                    <button class="right" size="mini" bindtap="update"> 编辑</button>
+                   
+                </view>
+                <view class="list-title">
+                    <view class="text" >客服微信:lixiaofei111028</view>
+                   
+                    <button class="right"  size="mini"> 复制</button>
+                   
+                </view>
+               
+            </view>
+        </content-card>
+
+
+ <view wx:for="{{transList}}" wx:key="msg">
+
+  <l-card  type="primary" l-img-class="right-card" plaintext="true"  full="true" >
+
+    <view class="containertag">
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag" class="describe" >提现</l-tag>
+      <l-tag plain="{{true}}" font-color="#d81e06" shape="circle" size="medium"  l-class="tag"  class="fanli">¥{{item.amount}}</l-tag>
+     
+    </view>
+    <view class="price-v">
+     <text class="price">{{item.createTime}}</text> <text class="yprice">{{item.transStatus == 1 ? '审核中' : item.transStatus == 2 ? '审核失败' : '提现成功'  }}  </text>  
+    </view>
+   
+  </l-card>
+</view>
+
+
+
+<l-loadmore show="{{true}}" end-text="我是有底线的~" type="{{lType}}">
+  <!-- <view slot="content">
+    我是有底线的~
+  </view> -->
+</l-loadmore>

+ 359 - 0
pages/trans/trans.wxss

@@ -0,0 +1,359 @@
+/* pages/trans/trans.wxss */
+
+.userinfo {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #aaa;
+}
+
+.userinfo-avatar {
+  overflow: hidden;
+  width: 128rpx;
+  height: 128rpx;
+  margin: 20rpx;
+  border-radius: 50%;
+}
+
+.usermotto {
+  margin-top: 200px;
+}
+
+.logo-container {
+  width           : 690rpx;
+  margin          : 30rpx auto;
+  background-color: #fff;
+  display         : flex;
+  flex-direction  : column;
+  align-items     : center;
+  padding         : 40rpx 0;
+  box-sizing      : border-box;
+  margin-bottom   : 30rpx;
+}
+
+.logo-img {
+  width : 220rpx;
+  height: 100rpx;
+}
+
+.logo-txt {
+  color    : #596c8e;
+  font-size: 28rpx;
+}
+
+.version-container {
+  display   : flex;
+  margin-top: 15rpx;
+}
+
+.container {
+  display       : flex;
+  flex-direction: column;
+  align-items   : center;
+}
+
+
+.num {
+  color: #fc6517;
+  font-size: 42rpx;
+  
+}
+
+.text {
+  height: 25rpx;
+  font-size: 25rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  color: rgba(102, 102, 102, 1);
+  line-height: 30rpx;
+  margin-top: 9rpx;
+}
+
+.grid-item {
+  height: 200rpx;
+} 
+
+
+
+.content-name {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  color: rgba(69, 82, 107, 1);
+  line-height: 20px;
+  margin-left: 8px;
+}
+
+.icon-container{
+  display: flex;
+  flex-direction: row;
+  align-items: center
+}
+
+.city{
+  font-size: 28rpx;
+  color: #333;
+  margin-right: 10rpx;
+}
+
+.aa{
+  margin-top: 20rpx;
+}
+
+.bb{
+  width: 500rpx !important; 
+}
+
+
+.header{
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+.content {
+  /* height: 400rpx; */
+  position: relative;
+}
+
+.tab-content {
+  min-height: 140rpx;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: rgba(140, 152, 174, 1);
+}
+
+.toggle-button {
+  position: absolute !important;
+  top: -80rpx;
+  right: 20rpx;
+  min-width: 72rpx !important;
+  padding: 0 !important;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50% !important;
+  background: transparent !important;
+}
+
+.swipeable-header {
+  margin: 0 auto;
+  width: 327rpx !important;
+  border: 0 !important;
+}
+
+.swipeable-class-inactive {
+  border-width: 8rpx !important;
+}
+
+.swipeable-class-active {
+  font-weight: 900 !important;
+  font-size: 34rpx !important;
+  border-width: 6rpx !important;
+}
+
+.line-tabs {
+  background: rgba(90, 120, 158, 1) !important;
+}
+
+.tab-image {
+  width: 44rpx !important;
+  height: 44rpx !important;
+}
+
+.line-class {
+  width: 30rpx !important;
+}
+
+
+.card {
+  margin: 10rpx auto !important;
+}
+
+.right-card {
+  height: 250rpx !important;
+  width: 250rpx !important;
+  border-radius: 12rpx !important;
+}
+
+.card-dot {
+  width: 18rpx;
+  height: 18rpx;
+  border-radius: 50%;
+  border: 6rpx solid #3963bc;
+  margin-left: 26rpx;
+}
+
+.card-top {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: 750rpx;
+  height: 100rpx;
+}
+
+
+.contentcard-name {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  color: rgba(69, 82, 107, 1);
+  line-height: 20px;
+  margin-left: 8px;
+}
+
+.contentcard {
+  margin:5rpx 0rpx 0rpx 0rpx;   
+  color: #666;
+  font-size: 25rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 5;
+}
+
+.avter-contentcard {
+  margin-top: 10rpx;
+  color: #333;
+  font-size: 26rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 5;
+}
+
+
+.super-long-test{
+  display: -webkit-box;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ font-size: 30rpx;
+ overflow: hidden;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp:2;
+}
+
+
+.empty-icon{
+  width: 30rpx;
+  height: 30rpx;
+  background-color:rgb(252, 248, 248);
+}
+
+
+.containertag{
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  flex-wrap: wrap;
+  margin:5rpx 30rpx 10rpx 10rpx;  
+}
+
+.btn{
+  margin-bottom: 5rpx;
+}
+.describe{
+  color: #f4f4f5;
+    font-size: 28rpx;
+    
+}
+
+.fanli{
+  position: absolute;
+  right: 10rpx;
+  
+}
+
+.l-tag {
+  padding: 0 16rpx;
+ 
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row;
+  color: #fff;
+  background-color: #3963bc;
+  margin-left: 15rpx;
+}
+.tag{
+  margin: 6rpx 15rpx 6rpx 0 !important;
+}
+.price-container{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-left: 10rpx;
+  
+}
+
+
+.price{
+  color:#d81e06;
+  font-size: 25rpx;
+  color: rgba(69, 82, 107, 1);
+  position: absolute;
+  
+}
+.yprice{
+  position: absolute;
+  right: 25rpx;
+  color: rgba(69, 82, 107, 1);
+  font-size: 25rpx;
+ 
+
+  
+}
+.price-v{
+  margin:5rpx 20rpx 10rpx 10rpx;   
+}
+
+
+
+.l-form-btn-class{
+  display: flex;
+  justify-content: space-around;
+  margin-top: 10rpx;
+}
+
+.tip-type{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  margin: 40rpx 0;
+}
+
+.l-input-container-class {
+  width: 100% !important;
+}
+
+
+.list-title {
+  padding: 10px;
+  
+  display: flex;
+  
+  justify-content: space-between;
+  
+  }
+
+
+  .list-title view{
+    width:50%;
+    
+    display:inline-block;
+    
+    }
+    
+    .right{
+    text-align:right;
+    
+    padding-right:30rpx;
+    
+    
+    }
+

+ 13 - 6
project.config.json

@@ -4,7 +4,7 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "es6": true,
     "enhance": true,
     "postcss": true,
@@ -20,16 +20,23 @@
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": false,
+    "useApiHostProcess": false,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.17.0",