ycm 2 éve
szülő
commit
114cc29056

+ 2 - 1
app.json

@@ -20,7 +20,8 @@
         "pages/my/cashier/cashier",
         "pages/order/access/access",
         "pages/order/deposit/deposit",
-        "pages/order/takeOut/takeOut"
+        "pages/order/takeOut/takeOut",
+        "pages/order/coupon/coupon"
     ],
     "window": {
         "backgroundTextStyle": "light",

BIN
image/my/01.png


+ 104 - 22
pages/my/coupon/coupon.js

@@ -1,4 +1,5 @@
 // pages/my/coupon/coupon.js
+const app = getApp();
 Page({
 
     /**
@@ -6,26 +7,29 @@ Page({
      */
     data: {
         down: false,
-        shopping: [
-            {
-                list: [
-                    'sss',
-                    'sss',
-                    'sss',
-                ],
-                isExpire:false
-            },
-            {
-                list: [
-                    'sss',
-                    'sss',
-                    'sss',
-                ],
-                isExpire:true
-            },
-        ],
+        shopping: [],
+        // shopping: [
+        //     {
+        //         list: [
+        //             'sss',
+        //             'sss',
+        //             'sss',
+        //         ],
+        //         isExpire:false
+        //     },
+        //     {
+        //         list: [
+        //             'sss',
+        //             'sss',
+        //             'sss',
+        //         ],
+        //         isExpire:true
+        //     },
+        // ],
         isNum:false,
-        code:''
+        code:'',
+        pageindex: 1,
+        currtime: ''
     },
 
     /**
@@ -33,15 +37,54 @@ Page({
      */
     onLoad: function (options) {
       
+    },
+    onShow: function(){
+        this.getdata()
+        this.setData({currtime: this.getcurrtime()})
+    },
+    getcurrtime(){
+        let that = this
+        let time = new Date()
+        let year = time.getFullYear()
+        let month = time.getMonth() + 1
+        let date = time.getDate()
+        let hours = time.getHours()
+        let minute = time.getMinutes()
+        let second = time.getSeconds()
+  
+        if (month < 10) { month = '0' + month }
+        if (date < 10) { date = '0' + date }
+        if (hours < 10) { hours = '0' + hours }
+        if (minute < 10) { minute = '0' + minute }
+        if (second < 10) { second = '0' + second }
+        // console.log(year + '-' + month + '-' + date + ' ' + hours + ':' + minute + ':' + second)
+        return year + '-' + month + '-' + date + ' ' + hours + ':' + minute + ':' + second
+    },
+    getdata(){
+        var that = this;
+        wx.showLoading()
+        app.api.useApi(app.globalData.baseAppUrl + "api/user/coupon", {}, "get").then(function (res) {
+            console.log(res)
+            wx.hideLoading()
+            if (that.data.pageindex == 1) {
+              that.setData({shopping: []})
+            }
+            if (res.message.data.data.length > 0) {
+              that.setData({shopping: that.data.shopping.concat(res.message.data.data)})
+            } else {
+              that.setData({pageindex: that.data.pageindex -= 1})
+            }
+        }).catch(function (err) { console.log(err) })
     },
     changeBtn(e) {
-        console.log(e.detail);
         if (e.detail.value || e.detail.value != '') {
             this.setData({
+                code: e.detail.value,
                 isNum:true
             })
         }else{
             this.setData({
+                code: e.detail.value,
                 isNum:false
             })
         }
@@ -51,7 +94,27 @@ Page({
         this.toast = this.selectComponent("#toast");
     },
     listenerLogin: function () {
-        this.toast.showToast('优惠券无效');
+        let that = this
+        // this.toast.showToast('优惠券无效');
+        wx.showLoading()
+        app.api.useApi(app.globalData.baseAppUrl + "api/coupon/code", {code:that.data.code}, "post").then(function (res) {
+            console.log(res)
+            if (res.code != 200) {
+                wx.showLoading({
+                    title: res.message.msg,
+                })
+                setTimeout(function () {
+                    wx.hideLoading()
+                }, 1000);
+            } else {
+                wx.showLoading({
+                    title: res.message.msg,
+                })
+                setTimeout(() => {
+                    that.getdata()
+                }, 1000);
+            }
+        }).catch(function (err) { console.log(err) })
     },
 
     exchange(){
@@ -63,7 +126,26 @@ Page({
             code:'',
             isNum:false
         })
-    }
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage(res) {
+        // res.target.dataset.id+
+        return {
+            title: '海星洗护',
+            path: '/pages/my/share/share',
+            imageUrl: '../../../image/my/01.png'
+        }
+    },
+      /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({pageindex:this.data.pageindex+=1})
+    this.getdata()
+  },
 
 
 })

+ 10 - 12
pages/my/coupon/coupon.wxml

@@ -9,30 +9,29 @@
 </view>
 
 <view class="listBoxs" >
-    <view class="itemBoxs {{item.isExpire?'opct' : ''}}" wx:for="{{shopping}}" wx:key="{{index}}">
+    <view class="itemBoxs {{currtime>item.use_end_time?'opct' : ''}}" wx:for="{{shopping}}" wx:key="{{index}}">
         <view class="top ">
             <view class="le flex ju-b">
-                <view class="tit">新人特惠洗护券</view>
+                <view class="tit">{{item.title}}</view>
                 <view class="num">
                     <text class="logo">¥</text>
-                    <text>15</text>
+                    <text>{{item.money}}</text>
                 </view>
             </view>
             <view class="lr  flex ju-b">
-                <view class="time">2021.12.06到期</view>
-
+                <view class="time">{{item.use_end_time}}到期</view>
                 <view class="old">
-                    满30可用
+                    满{{item.full}}可用
                 </view>
             </view>
         </view>
         <view class="line"></view>
         <view class="footer flex ju-b">
             <view class="le " bindtap="change">
-                <collapse list="{{item.list}}"></collapse>
+                <collapse list="{{[item.desc||'无']}}"></collapse>
             </view>
-            <view class="lr" wx:if="{{!item.isExpire}}">分享好友</view>
-            <image src="/image/coupon/yilingqu.png" class="guoqi" wx:else></image>
+            <button open-type="share" data-id="{{1}}" wx:if="{{item.is_share==1}}" class="lr">分享好友</button>
+            <image src="/image/coupon/yilingqu.png" class="guoqi" wx:if="{{currtime>item.use_end_time}}"></image>
         </view>
     </view>
 </view>
@@ -44,8 +43,7 @@ wx:if="{{shopping.length == 0}}"
   description="暂无优惠券"
 />
 
-<view class="footerTips flex ju-b">
-
+<!-- <view class="footerTips flex ju-b">
     <view class="le flex">
         <text>优惠券使用说明</text>
         <van-icon name="arrow" color="#A5A8AD" size="20rpx" />
@@ -57,7 +55,7 @@ wx:if="{{shopping.length == 0}}"
         <van-icon name="arrow" color="#A5A8AD" size="20rpx" />
 
     </view>
-</view>
+</view> -->
 
 
 <toast id='toast' icon="/image/icon/tips.png">

+ 1 - 0
pages/my/coupon/coupon.wxss

@@ -122,6 +122,7 @@ page {
     color: #FFFFFF;
     line-height: 48rpx;
     text-align: center;
+    margin: 0;
 }
 
 

+ 1 - 1
pages/my/share/share.json

@@ -3,5 +3,5 @@
     "van-overlay": "@vant/weapp/overlay/index",
     "van-field": "@vant/weapp/field/index"
   },
-  "navigationBarTitleText": "分享优惠劵"
+  "navigationBarTitleText": "领取优惠劵"
 }

+ 31 - 2
pages/order/confirmOreder/confirmOreder.js

@@ -40,7 +40,8 @@ Page({
         total_price:0,
         isphone: false,
         isphonenum: false,
-        phonenum: ''
+        phonenum: '',
+        couponinfo: ''
     },
     onLoad(opticon) {
         let order_no = opticon.order_no;
@@ -55,6 +56,29 @@ Page({
         })
 
     },
+    onShow(){
+        this.setData({couponinfo: this.data.citem})
+        if(this.data.couponinfo){
+            if(this.data.couponinfo.type==1){
+                if((parseFloat(this.data.freight)-parseFloat(this.data.couponinfo.money))>0){
+                    this.setData({total_price: (parseFloat(this.data.total_price) - parseFloat(this.data.couponinfo.money)).toFixed(2)})
+                }else{
+                    this.setData({total_price: (parseFloat(this.data.total_price) - parseFloat(this.data.freight)).toFixed(2)})
+                }
+            }else if(this.data.couponinfo.type==2){
+                if((parseFloat(this.data.total_price) - parseFloat(this.data.couponinfo.money))>0){
+                    this.setData({total_price: (parseFloat(this.data.total_price) - parseFloat(this.data.couponinfo.money)).toFixed(2)})
+                }else{
+                    this.setData({total_price: 0})
+                }
+            }
+        }
+    },
+    goyhq(){
+        wx.navigateTo({
+          url: '../coupon/coupon?totalprice='+this.data.total_price+'&freight='+this.data.freight,
+        })
+    },
     changeisphone(){
         this.setData({isphone: !this.data.isphone})
     },
@@ -296,11 +320,16 @@ Page({
     },
     orderConfirm() {
         var that=this;
+        let cid = 0
+        if(that.data.couponinfo!=''&&that.data.couponinfo!=undefined){
+            cid = that.data.couponinfo.pivot.coupon_id
+        }
         app.api.useApi(app.globalData.baseAppUrl + "api/orders", {
             order_no: that.data.order_no,
             order_type: that.data.mode,
             user_remark: that.data.remark,
-            address_id:that.data.address_id
+            address_id:that.data.address_id,
+            coupon_id: cid
         }, "post").then(function (res) {
             console.log(res)
             if (res.code != 200) {

+ 4 - 4
pages/order/confirmOreder/confirmOreder.wxml

@@ -23,14 +23,14 @@
     </view>
 
 
-    <!-- <view class="footer flex ju-b">
+    <view class="footer flex ju-b">
         <view class="le">优惠券</view>
-        <view class="lr flex">
-            <text class="m-right-15">暂无优惠券可用</text>
+        <view class="lr flex" bindtap="goyhq">
+            <text class="m-right-15 {{couponinfo!=''?'red_price':''}}">{{couponinfo!=''?'-'+couponinfo.money:'使用优惠券'}}</text>
             <van-icon name="arrow" color="#C7C7CC" />
 
         </view>
-    </view>-->
+    </view>
 </view> 
 
 <!-- <view class="addService m-bottom-25">

+ 4 - 0
pages/order/confirmOreder/confirmOreder.wxss

@@ -371,4 +371,8 @@ page {
     color: #fff;
     background: #32A517;
     border-radius: 8rpx;
+}
+
+.red_price{
+    color: #ff7300;
 }

+ 150 - 0
pages/order/coupon/coupon.js

@@ -0,0 +1,150 @@
+
+const app = getApp();
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        down: false,
+        shopping: [],
+        // shopping: [
+        //     {
+        //         list: [
+        //             'sss',
+        //             'sss',
+        //             'sss',
+        //         ],
+        //         isExpire:false
+        //     },
+        //     {
+        //         list: [
+        //             'sss',
+        //             'sss',
+        //             'sss',
+        //         ],
+        //         isExpire:true
+        //     },
+        // ],
+        isNum:false,
+        code:'',
+        pageindex: 1,
+        currtime: '',
+        totalprice: 0,
+        freight: 0
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+      this.setData({totalprice: parseFloat(options.totalprice),freight:parseFloat(options.freight)})
+    },
+    onShow: function(){
+        this.getdata()
+        this.setData({currtime: this.getcurrtime()})
+    },
+    gob(e){
+        console.log(e.target.dataset.item)
+        let pages = getCurrentPages();
+        let prevPage = pages[pages.length - 2];
+        prevPage.setData({
+            citem: e.target.dataset.item,
+        })
+        wx.navigateBack({});
+    },
+    getcurrtime(){
+        let that = this
+        let time = new Date()
+        let year = time.getFullYear()
+        let month = time.getMonth() + 1
+        let date = time.getDate()
+        let hours = time.getHours()
+        let minute = time.getMinutes()
+        let second = time.getSeconds()
+  
+        if (month < 10) { month = '0' + month }
+        if (date < 10) { date = '0' + date }
+        if (hours < 10) { hours = '0' + hours }
+        if (minute < 10) { minute = '0' + minute }
+        if (second < 10) { second = '0' + second }
+        // console.log(year + '-' + month + '-' + date + ' ' + hours + ':' + minute + ':' + second)
+        return year + '-' + month + '-' + date + ' ' + hours + ':' + minute + ':' + second
+    },
+    getdata(){
+        var that = this;
+        wx.showLoading()
+        app.api.useApi(app.globalData.baseAppUrl + "api/user/coupon", {}, "get").then(function (res) {
+            console.log(res)
+            wx.hideLoading()
+            if (that.data.pageindex == 1) {
+              that.setData({shopping: []})
+            }
+            if (res.message.data.data.length > 0) {
+              that.setData({shopping: that.data.shopping.concat(res.message.data.data)})
+            } else {
+              that.setData({pageindex: that.data.pageindex -= 1})
+            }
+        }).catch(function (err) { console.log(err) })
+    },
+    changeBtn(e) {
+        if (e.detail.value || e.detail.value != '') {
+            this.setData({
+                code: e.detail.value,
+                isNum:true
+            })
+        }else{
+            this.setData({
+                code: e.detail.value,
+                isNum:false
+            })
+        }
+        
+    },
+    onReady: function () {
+        this.toast = this.selectComponent("#toast");
+    },
+    listenerLogin: function () {
+        let that = this
+        // this.toast.showToast('优惠券无效');
+        wx.showLoading()
+        app.api.useApi(app.globalData.baseAppUrl + "api/coupon/code", {code:that.data.code}, "post").then(function (res) {
+            console.log(res)
+            if (res.code != 200) {
+                wx.showLoading({
+                    title: res.message.msg,
+                })
+                setTimeout(function () {
+                    wx.hideLoading()
+                }, 1000);
+            } else {
+                wx.showLoading({
+                    title: res.message.msg,
+                })
+                setTimeout(() => {
+                    that.getdata()
+                }, 1000);
+            }
+        }).catch(function (err) { console.log(err) })
+    },
+
+    exchange(){
+        if (!this.data.isNum) return
+        this.listenerLogin()
+    },
+    clearValue(){
+        this.setData({
+            code:'',
+            isNum:false
+        })
+    },
+      /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({pageindex:this.data.pageindex+=1})
+    this.getdata()
+  },
+
+
+})

+ 13 - 0
pages/order/coupon/coupon.json

@@ -0,0 +1,13 @@
+{
+    "usingComponents": {
+      "collapse": "/components/collapse/collapse",
+      "van-icon": "@vant/weapp/icon/index",
+      "van-field": "@vant/weapp/field/index",
+      "toast": "/components/toast/toast",
+      "van-empty": "@vant/weapp/empty/index"
+  
+  
+    },
+    "navigationBarTitleText": "优惠券"
+  
+  }

+ 55 - 0
pages/order/coupon/coupon.wxml

@@ -0,0 +1,55 @@
+<!--pages/order/coupon/coupon.wxml-->
+<view class="listBoxs" >
+    <!-- totalprice<item.full?'opct':'' -->
+    <view class="itemBoxs" wx:for="{{shopping}}" wx:key="{{index}}">
+        <view class="top ">
+            <view class="le flex ju-b">
+                <view class="tit"><span style="font-size: 24rpx;color: #ff9679;">[{{item.type==1?'免运费券':item.type==2?'满减券':item.type==3?'免单券':''}}]</span>{{item.title}}</view>
+                <view class="num">
+                    <text class="logo">¥</text>
+                    <text>{{item.money}}</text>
+                </view>
+            </view>
+            <view class="lr  flex ju-b">
+                <view class="time">{{item.use_end_time}}到期</view>
+                <view class="old">
+                    满{{item.full}}可用
+                </view>
+            </view>
+        </view>
+        <view class="line"></view>
+        <view class="footer flex ju-b">
+            <view class="le " bindtap="change">
+                <collapse list="{{[item.desc||'无']}}"></collapse>
+            </view>
+            <view class="lr" wx:if="{{totalprice>=item.full&&item.type==2}}" bindtap="gob" data-item="{{item}}">使用</view>
+            <view class="lr" wx:elif="{{freight>0&&item.type==1}}" bindtap="gob" data-item="{{item}}">使用</view>
+            <view style="font-size: 24rpx;color: #999;" wx:else>不可使用</view>
+        </view>
+    </view>
+</view>
+
+<van-empty
+wx:if="{{shopping.length == 0}}"
+  class="custom-image"
+  image="/image/coupon/no-coupons.png"
+  description="暂无优惠券"
+/>
+
+<!-- <view class="footerTips flex ju-b">
+    <view class="le flex">
+        <text>优惠券使用说明</text>
+        <van-icon name="arrow" color="#A5A8AD" size="20rpx" />
+    </view>
+    <view class="line"></view>
+    <view class="lr flex">
+        <text>查看过期优惠券</text>
+
+        <van-icon name="arrow" color="#A5A8AD" size="20rpx" />
+
+    </view>
+</view> -->
+
+
+<toast id='toast' icon="/image/icon/tips.png">
+</toast>

+ 158 - 0
pages/order/coupon/coupon.wxss

@@ -0,0 +1,158 @@
+
+page {
+    width: 750rpx;
+    height: 100vh;
+    background: #F6F6F6;
+}
+
+.topBoxs {
+    width: 750rpx;
+    height: 140rpx;
+    background: #FFFFFF;
+    padding: 30rpx 25rpx;
+}
+
+.topBoxs .input {
+    width: 470rpx;
+    height: 80rpx;
+    background: #F6F6F6;
+    border-radius: 8rpx;
+    padding:0 25rpx;
+    box-sizing: border-box;
+    color: #999;
+    font-size: 30rpx;
+}
+
+.topBoxs .now {
+    width: 210rpx;
+    height: 80rpx;
+    border-radius: 8rpx;
+    font-size: 30rpx;
+    line-height: 80rpx;
+    text-align: center;
+}
+
+.gray {
+    color: #FFFFFF;
+    background: #CCCCCC;
+
+}
+
+.skyBlue {
+    color: #FFFFFF;
+    background: linear-gradient(270deg, #467FFF 0%, #4699FF 100%);
+}
+
+.listBoxs {
+    padding: 25rpx;
+
+}
+
+.listBoxs .itemBoxs {
+    width: 702rpx;
+    background: #FFFFFF;
+    border-radius: 12rpx;
+    margin: auto;
+    margin-bottom: 25rpx;
+    padding:50rpx 25rpx 32rpx;
+    position: relative;
+
+}
+
+.opct{
+    opacity: .75;
+}
+
+.top .le {
+    line-height: 45rpx;
+}
+
+.top .tit {
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #191C27;
+}
+
+.top .time {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.top .lr {
+    text-align: center;
+}
+
+.top .num .logo {
+    font-size: 32rpx;
+    font-weight: normal;
+
+}
+
+.top .num {
+    font-size: 55rpx;
+    font-weight: bold;
+    color: #FF663D;
+}
+
+.top .old {
+    font-size: 24rpx;
+    color: #666666;
+}
+
+.itemBoxs .line {
+    width: 100%;
+    height: 2rpx;
+    background-image: linear-gradient(to right, #EDEDED 0%, #EDEDED 50%, transparent 50%);
+    background-size: 20rpx 20rpx;
+    background-repeat: repeat-x;
+    margin: 20rpx 0;
+}
+
+.footer {
+    align-items: flex-start;
+}
+
+
+.footer .lr {
+    width: 136rpx;
+    height: 48rpx;
+    background: linear-gradient(360deg, #FE425D 0%, #FE7011 100%);
+    border-radius: 30rpx;
+    font-size: 24rpx;
+    color: #FFFFFF;
+    line-height: 48rpx;
+    text-align: center;
+    margin: 0;
+}
+
+
+
+.footerTips {
+    font-size: 24rpx;
+    color: #666666;
+    position: absolute;
+    left: 50%;
+    bottom: 2%;
+    width: 60%;
+    transform: translate(-50%, 0);
+}
+
+.footerTips .line {
+    width: 1px;
+    height: 20rpx;
+    background: #BDBDBD;
+}
+
+.guoqi{
+    width: 90rpx;
+    height: 90rpx;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    z-index: 10;
+}
+
+
+.custom-image .van-empty__image{
+    width: 690rpx;
+}

+ 10 - 24
project.config.json

@@ -1,17 +1,8 @@
 {
     "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "packOptions": {
-        "ignore": [
-            {
-                "value": ".eslintrc.js",
-                "type": "file"
-            }
-        ],
-        "include": []
-    },
     "setting": {
-        "urlCheck": false,
-        "es6": true,
+        "urlCheck": true,
+        "es6": false,
         "enhance": true,
         "postcss": true,
         "preloadBackgroundData": false,
@@ -29,22 +20,15 @@
         "compileHotReLoad": true,
         "lazyloadPlaceholderEnable": false,
         "useMultiFrameRuntime": true,
-        "useApiHook": true,
-        "useApiHostProcess": true,
         "babelSetting": {
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
         },
-        "useIsolateContext": false,
+        "useIsolateContext": true,
         "userConfirmedBundleSwitch": false,
         "packNpmManually": false,
-        "packNpmRelationList": [
-            {
-                "packageJsonPath": "./package.json",
-                "miniprogramNpmDistDir": "./"
-            }
-        ],
+        "packNpmRelationList": [],
         "minifyWXSS": true,
         "disableUseStrict": false,
         "minifyWXML": true,
@@ -54,9 +38,6 @@
         "useStaticServer": true
     },
     "compileType": "miniprogram",
-    "libVersion": "2.22.0",
-    "appid": "wx3474318f187cd0f2",
-    "projectname": "laundry",
     "cloudfunctionRoot": "cloudfunction/",
     "cloudfunctionTemplateRoot": "cloudfunctionTemplate/",
     "editorSetting": {
@@ -308,5 +289,10 @@
                 }
             ]
         }
-    }
+    },
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "appid": "wx3474318f187cd0f2"
 }

+ 8 - 245
project.private.config.json

@@ -1,265 +1,28 @@
 {
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": false,
+        "urlCheck": false
     },
     "condition": {
         "miniprogram": {
             "list": [
                 {
-                    "name": "",
-                    "pathName": "pages/tabber/my/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/address/address",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/access/access",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/map/map",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/map/list",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/confirmOreder/confirmOreder",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/account/account",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/cashier/cashier",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/address/addSite/addSite",
-                    "query": "parmise=%E6%B7%BB%E5%8A%A0",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/serviceDetails/serviceDetails",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/serviceDetails/serviceDetails",
-                    "query": "goods_id=1",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/serviceDetails/serviceDetails",
-                    "query": "goods_id=1&title=%E5%A4%96%E9%83%A8%E6%B5%8B%E8%AF%95%E7%BD%91%E7%82%B9%20%20&address=22%20&worke_id=1",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/placeOrder/placeOrder",
-                    "query": "parmise=%7B%22id%22%3A1%2C%22institution_id%22%3A1%2C%22name%22%3A%22%E6%B5%8B%E8%AF%95%E7%BD%91%E7%82%B9%20%22%2C%22title%22%3A%22%E5%A4%96%E9%83%A8%E6%B5%8B%E8%AF%95%E7%BD%91%E7%82%B9%20%20%22%2C%22province_id%22%3A110000%2C%22city_id%22%3A110100%2C%22area_id%22%3A110101%2C%22address%22%3A%2222%20%22%2C%22signing_status%22%3A1%2C%22business_status%22%3A1%2C%22lng%22%3A%22114.320249%20%22%2C%22lat%22%3A%2230.448342%22%2C%22type%22%3A%220%22%2C%22contact%22%3A%22%20%22%2C%22type_info%22%3A%22%22%2C%22created_at%22%3Anull%2C%22updated_at%22%3Anull%2C%22distance%22%3A12337.04%2C%22unit%22%3A%5B%7B%22id%22%3A1%2C%22type%22%3A1%2C%22price%22%3A%220.00%22%2C%22phone%22%3A%2218064109218%20%22%2C%22svctm%22%3A%22%E5%91%A8%E4%B8%80%E8%87%B3%E5%91%A8%E4%BA%94%2018-20%3A00%2C22%3A00-23%3A00%22%2C%22type_name%22%3A%22%E4%BB%A3%E6%94%B6%E7%82%B9%22%7D%2C%7B%22id%22%3A2%2C%22type%22%3A2%2C%22price%22%3A%220.00%22%2C%22phone%22%3A%2218064109218%20%22%2C%22svctm%22%3A%22%E5%91%A8%E4%B8%80%E8%87%B3%E5%91%A8%E4%BA%94%2018-20%3A00%2C22%3A00-23%3A00%20%22%2C%22type_name%22%3A%22%E5%AD%98%E5%8F%96%E6%9F%9C%22%7D%2C%7B%22id%22%3A3%2C%22type%22%3A3%2C%22price%22%3A%2210.00%22%2C%22phone%22%3A%2218064109218%20%22%2C%22svctm%22%3A%22%E5%91%A8%E4%B8%80%E8%87%B3%E5%91%A8%E4%BA%94%2018-20%3A00%2C22%3A00-23%3A00%20%20%22%2C%22type_name%22%3A%22%E4%B8%8A%E9%97%A8%E5%8F%96%E9%80%81%22%7D%5D%7D",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/confirmOreder/confirmOreder",
-                    "query": "order_no=ws20220224110319214623",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/confirmOreder/confirmOreder",
-                    "query": "order_no=ws20220224154137393425",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/confirmOreder/confirmOreder",
-                    "query": "order_no=ws20220225153100341422",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/cashier/cashier",
-                    "query": "order_no=ws20220225165211280404",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/tabber/order/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/deposit/deposit",
-                    "query": "order_no=ws20220225183504769862",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220226113409856802",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/takeOut/takeOut",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/deposit/deposit",
-                    "query": "order_type=2",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/confirmOreder/confirmOreder",
-                    "query": "order_no=ws20220302152438381631",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220302154537348350",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/deposit/deposit",
-                    "query": "order_type=2",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220302174435556019",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/cashier/cashier",
-                    "query": "order_no=ws20220302183810854740",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/cashier/cashier",
-                    "query": "order_no=ws20220302183828283716",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/my/account/account",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/order/deposit/deposit",
-                    "pathName": "pages/order/deposit/deposit",
+                    "name": "优惠券",
+                    "pathName": "pages/my/coupon/coupon",
                     "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "pages/my/cashier/cashier",
-                    "pathName": "pages/my/cashier/cashier",
-                    "query": "order_no=ws20220306124516195114",
-                    "scene": null
-                },
-                {
-                    "name": "pages/order/deposit/deposit",
-                    "pathName": "pages/order/deposit/deposit",
-                    "query": "order_type=2&network_id=1&is_deposit=1",
-                    "scene": null
-                },
-                {
-                    "name": "pages/order/detail/detail",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220306152532424252",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220307142633945501",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
-                    "name": "",
-                    "pathName": "pages/order/detail/detail",
-                    "query": "order_no=ws20220310165939553590",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/order/deposit/deposit",
-                    "query": "order_type=2&network_id=1&is_deposit=1&order_num=123123&device_id=123123",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "清洗报告",
-                    "pathName": "pages/order/cleanReport/cleanReport",
-                    "query": "id=5068",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "订单",
-                    "pathName": "pages/tabber/order/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/tabber/home/index",
+                    "name": "领取优惠券",
+                    "pathName": "pages/my/share/share",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
-                    "name": "",
-                    "pathName": "pages/my/share/share",
+                    "name": "我的",
+                    "pathName": "pages/tabber/my/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null