hmy_farmer-main.git

xuxueyang

2024-07-29 d89c495a7da517d653e9ea42b8e6405eef823ef6

update 还有售后需要测试一下

已修改14个文件

已添加3个文件

	App.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages.json	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/home/supplier-home.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/login/supplier-login.vue	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order-detail.vue	78 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/order/order.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/user/supplier-user.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	store/index.js	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/partner/delivery/delivery-detail.vue	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/partner/delivery/delivery-home.vue	143 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/partner/delivery/delivery.vue	112 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/partner/markup-config/markup-config.vue	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/partner/order-manage/order-manage.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/supplier/order-sale/order-sale-detail.vue	404 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/supplier/order-sale/order-sale.vue	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/supplier/order-settlement/order-settlement-detail.vue	225 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	sub_pages/supplier/order-settlement/order-settlement.vue	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 App.vue

@@ -26,9 +26,16 @@
                    const res = await this.$store.dispatch('getCurrentInfo');

                    // #ifndef PUB_CUSTOMER

                    if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {

                        if(this.currentInfo.type==='admin'){
                            uni.reLaunch({
                                url: '/sub_pages/partner/delivery/delivery-home'
                            })
                        }else{
                        uni.reLaunch({

                            url: '/pages/home/supplier-home'

                        })

                        }

						
                    } else {

                        uni.reLaunch({

                            url: '/pages/login/supplier-login'


 pages.json

@@ -144,6 +144,23 @@
                },



                {

                    "path": "order-records/order-records",

                    "style": {

                        "navigationBarTitleText": "扣款记录",

                        "enablePullDownRefresh": true,

                        "navigationBarBackgroundColor": "#E6F2EB"

                    }

                },

                {

                    "path": "protocol",

                    "style": {

                        "navigationBarTitleText": "协议",

                        "enablePullDownRefresh": false

                    }

                },

                // #endif				
                // #ifdef PUB_PARTNER || PUB_SUPPLIER

                {

                    "path": "order-settlement/order-settlement",

                    "style": {

                        "navigationBarTitleText": "账单结算",

@@ -158,18 +175,17 @@
                    }

                },

                {

                    "path": "order-records/order-records",

                    "style": {

                        "navigationBarTitleText": "扣款记录",

                        "enablePullDownRefresh": true,

                        "navigationBarBackgroundColor": "#E6F2EB"

                    "path" : "order-settlement/order-settlement-detail",
                    "style" : 
                    {
                        "navigationBarTitleText" : "结算单详情"
                    }

                },

                {

                    "path": "protocol",

                    "style": {

                        "navigationBarTitleText": "协议",

                        "enablePullDownRefresh": false

                    "path": "order-sale/order-sale-detail",

                    "style" : 
                    {
                        "navigationBarTitleText" : "理赔单详情"
                    }

                }

                // #endif

@@ -213,6 +229,13 @@
                        "navigationBarTitleText": "质检详情",

                        "enablePullDownRefresh": true

                    }

                },

                {

                    "path": "delivery/delivery-home",

                    "style": {

                        "navigationBarTitleText": "",

                        "navigationStyle": "custom"

                    }

                }

                // #endif

            ]


 pages/home/supplier-home.vue

@@ -102,7 +102,7 @@
                </view>
            </view>
        </view>
        <view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;">
        <view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;" v-if="selftype=='supplier'">
            <view class="rate-view flex1" style="max-width: 140rpx;">
                <view class="title">售后率</view>
                <view class="title" style="color: red;">{{tj.salesRate||0}}%</view>
@@ -163,13 +163,13 @@
                    </view>
                    <view class="order-desc syst">售后理赔</view>
                </view>
                <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-records/order-records',true)">
            <!--     <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-records/order-records',true)">
                    <view class="img-c">
                        <image class="icon margin-bottom order-icon kkjl"
                            src="/static/images/supplier/user/user-icon-kkjl.png" mode="scaleToFill" />
                    </view>
                    <view class="order-desc wbsp">扣款记录</view>
                </view>
                </view> -->
            </view>
        </view>


 pages/login/supplier-login.vue

@@ -26,16 +26,11 @@


          </view>

          <view class="t-a input form-input" v-if="loginType=='pwd'">

            <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->

            <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>

          </view>

          <view class="t-a input form-input" v-if="loginType=='code'">





            <!--                         <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />

            <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">

              {{getCodeText}}

            </view> -->

            <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">

              <template slot="suffix">

                <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">

@@ -47,22 +42,34 @@




          <view class="t-a form-input" v-if="loginType=='code'">

            <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->

            <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>



          </view>





          <button @tap="login()" class="bottom-button">登 录</button>



          <view class="flex">

            <view class="topic-font" v-if="loginType=='pwd'" @click="loginType='code'">手机验证码登录</view>

            <view class="topic-font" v-if="loginType=='code'" @click="loginType='pwd'">账号密码登录</view>

                        <view class="topic-font" v-if="loginType=='pwd'&&apitype!=='loginAdmin'" @click="loginType='code'">手机验证码登录</view>

                        <view class="topic-font" v-if="loginType=='code'&&apitype!=='loginAdmin'" @click="loginType='pwd'">账号密码登录</view>



            <view class="topic-font m-l-a m-r-0" @click="toReg">前往注册</view>

                        <view class="topic-font m-l-a m-r-0" v-if="apitype!=='loginAdmin'" @click="toReg">前往注册</view>



            <!-- #ifdef PUB_CUSTOMER -->

            <view class="topic-font m-l-a m-r-0" @click="toHome">返回首页</view>

            <!-- #endif -->

                        <!-- #ifdef PUB_PARTNER -->

                        <view class="topic-font m-l-a m-r-0" @click="()=>{

                            if(apitype==='loginPartner'){

                                apitype = 'loginAdmin'
                                loginType = 'pwd'

                            }else{

                                apitype = 'loginPartner'

                            }

                        }">

                            切换为{{apitype!=='loginPartner'?'合伙人':'质检人员'}}登录

                        </view>

                        <!-- #endif -->

          </view>



        </form>


 pages/order/order-detail.vue

@@ -141,8 +141,9 @@
                    }
                    break
                    case 'evaluate': {
                        const res = await this.$message.confirm('请输入评价信息', {
                            editable: true
                        const res = await this.$message.confirm('', {
                            editable: true,
                            title:'请输入评价信息'
                        })
                        if (res.content && res.confirm) {
                            // 发送请求
@@ -190,9 +191,8 @@
        </view>
        <view class="address-container bg-white br-4 m-t-12">
            <view class="flex">
                <view class="icon-loc m-r-10">
                    <image src="/static/common/icon-loc.png" class="image"></image>
                </view>
                <image src="/static/common/icon-loc.png" class="image  m-r-10"></image>
				
                <view class="info">
                    <view class="title">
                        {{ dto.customer }}
@@ -212,7 +212,8 @@
                </image>
                <view class="flex1">
                    <view class=" flex">
                        <view class="title"><span class="level">{{ item.flowerCategory }}</span><span class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
                        <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
                                class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
                        </view>
                        <!--            <view class="m-l-a m-r-0">-->
                        <!--              {{item.flowerCategory || '-'}}-->
@@ -351,8 +352,6 @@
            </view>
            <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
            </view>
            <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
            </view>
            <!--       <view class="button button-1" @click="buttonClick('couldRefund')"
            v-if="dto.couldRefund"> 退款
      </view> -->
@@ -370,10 +369,42 @@
        background: #F7F7F7;
        padding: 30rpx;

        .info-container {
            .button-space {
                min-height: 140rpx;
            }

        .buttons-bottom {
            position: fixed;
            left: 0;
            bottom: 0;
            right: 0;
            height: 120rpx;
            background-color: #FFFFFF;
            box-shadow: 0 2rpx 30rpx rgba(0, 0, 0, .3);

            .button {
                border-radius: 42rpx;
                border: 2rpx solid #CECECE;
                font-weight: 400;
                font-size: 30rpx;
                color: #999999;
                text-align: center;
                line-height: 60rpx;
                height: 60rpx;
                padding: 10rpx 30rpx;
                background-color: #FFFFFF;
                margin: 0 auto;
                display: inline-block;
                vertical-align: middle;
                margin-top: 20rpx;
                min-width: 120rpx;
            }

            .button-1 {}
        }

        .info-container {


            .icon-kf {
                width: 44rpx;
@@ -394,25 +425,6 @@
                }
            }

            .buttons-bottom {
                position: fixed;
                left: 0;
                bottom: 0;
                right: 0;
                height: 120rpx;

                .button {
                    border-radius: 42rpx;
                    border: 2rpx solid #CECECE;
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #999999;
                    text-align: center;
                    line-height: 76rpx;
                }

                .button-1 {}
            }
        }

        .info-container {
@@ -450,18 +462,14 @@
        .address-container {
            padding: 28rpx;

            .icon-loc {
                width: 48rpx;
                height: 48rpx;
                background: #20613D;
                border-radius: 50%;

                .image {
                // background-color: #20613D;
                border-radius: 50%;
                    margin-top: 8rpx;
                    margin-left: 8rpx;
                    width: 32rpx;
                    height: 32rpx;
                }
                // padding: 8rpx;
            }

            .info {

 pages/order/order.vue

@@ -156,8 +156,8 @@
      line-height: 40rpx;
      margin: 0 auto;
      //min-width: ;
      padding-left: 20rpx;
      padding-right: 20rpx;
      // padding-left: 10rpx;
      // padding-right: 10rpx;
      width: fit-content;
      min-width: 120rpx;
      text-align: center;
@@ -167,7 +167,7 @@
      font-weight: 600;
      font-size: 32rpx;
      color: #20613D;
      line-height: 44rpx;
      // line-height: 44rpx;
    }

    .status-each:first-child {

 pages/user/supplier-user.vue

@@ -31,8 +31,11 @@
                    <view class="t1">

                        {{

              (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-'

            }}<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">

            }}

                        <span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">

                            ({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>

                        <span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">

                            ({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>

                    </view>

                    <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view>

                </view>

@@ -145,7 +148,8 @@
        </view>

        <!-- #endif -->

        <view class="user-utils m-20">

            <view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/customer-info/customer-info',true)">

            <view class="user-util m-t-12 flex" v-if="selftype==='customer'||!selftype"

                @click="goto('/sub_pages/customer/customer-info/customer-info',true)">

                <view class="title">个人信息</view>

                <view class="right-icon">

                    <uni-icons type="right"></uni-icons>


 store/index.js

@@ -258,47 +258,47 @@
                        clientType: data.clientType || 'app'
                    }
                })
                console.log('resp', resp)
                if (resp && resp.code == 0) {
                    // await getCurrentInfo()
                    // // this.$message.showToast('登录成功')
                    // console.log(resp)
                    storage.setItem('token', resp.data.access_token)
                    commit("updateLogin", true)
                    await dispatch('getCurrentInfo')

                    console.log('login,reLaunch')
                    // #ifdef APP
                    var KeepAliveModule = uni.requireNativePlugin("yh-nl") //保活组件

                    KeepAliveModule && KeepAliveModule.startLocation({
                        intervalTime: 5000, //定位间隔时间
                        gaodeApiKey: "0eef1axxxxxx7964", //高德地图Key，已停用，引入插件配置
                        locationMode: 1, //定位模式
                        purpose: 0, //定位场景
                        ifUpload: true, //是否上报服务器
                        uploadUrl: "http://bio51-api.fixbug.fun/api/current/employee/location", //上报接口
                        params: "{'lat':'1','lng':'3'}", //其他参数
                        headers: "{'authorization1':'Bearer xOHeJhg'}",
                    }, function (res) {
                        console.log("启用结果：", res);
                        let ret = KeepAliveModule.getCurrentLocation();
                        console.log("启用结果2：", ret);
                    });
                    // #endif
                    // uni.redirectTo({
                    //     url: '/views/app/app-home/app-home'
                    // })
                    uni.reLaunch({
                        url: '/pages/home/supplier-home'
                    })
                } else {
                    // this.$message.showToast('登录失败')

                }
                } else {}
                return resp
            }

        },
        loginAdmin: async function({
            commit,
            dispatch,
            state
        }, data) {
            {
                // + ((data
                //     .phoneNumber || data.tel) ? '/phone' : '')
                const resp = await http.request('post', '/api/login/admin/wx', {
                    data: {
                        username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
                            data.tel) : data.username,
                        password: data.password,
                        tel: data.phoneNumber || data.tel,
                        smsCode: data.smsCode || ''
                    },
                    params: {
                        clientType: data.clientType || 'app'
                    }
                })
                if (resp && resp.code == 0) {
                    storage.setItem('token', resp.data.access_token)
                    commit("updateLogin", true)
                    await dispatch('getCurrentInfo')
                    uni.reLaunch({
                        url: '/sub_pages/partner/delivery/delivery-home'
                    })
                } else {}
                return resp
            }
        },
        loginSupplier: async function ({
                                           commit,
@@ -397,14 +397,16 @@
            }

        },
        submitShopping: async function ({commit, dispatch}, data) {
        submitShopping: async function({
            commit,
            dispatch
        }, data) {
            const resp = await http.request('post', '/api/customer/flower/cart/change-num', {
                    data: {
                        id: data.id,
                        num: 1
                    }
                }
            )
            })
            if (resp && resp.code === 0) {
                message.showToast('添加购物车成功')
                dispatch('sign_add', 'shopping')

 sub_pages/partner/delivery/delivery-detail.vue

@@ -18,8 +18,7 @@
        checkRemarks: '',
        deductAmount: 0,
      },
      check_status: [
        {
                check_status: [{
          label: '退回',
          value: 'back'
        },
@@ -55,7 +54,7 @@
    async clickCheck(item, status) {
      this.form = {
        id: item.id || '',
        status: '',
                    status: status,
        statusStr: '',
        checkImageList: item.checkImageList || [],
        checkRemarks: item.checkRemarks || '',
@@ -78,9 +77,10 @@
      this.$message.showLoading()
      const {
        code
      } = await this.$http.request('get', '/api/delivery/list/view/check', {
                } = await this.$http.request('post', '/api/delivery/list/view/check', {
        data: {
          ...this.form
                        ...this.form,
                        deductAmount: parseFloat(this.form.deductAmount) || 0
        }
      })
      this.$message.hideLoading()
@@ -131,6 +131,7 @@
                  .url || ''
              that.$message.hideLoading()
              that.form.checkImageList.push(pic)
                                console.log('form', that.form)
              that.$forceUpdate()
            }).catch(res => {
              that.$message.hideLoading()
@@ -144,7 +145,7 @@
}
</script>
<template>
  <view class="delivery-detail-page">
    <view class="delivery-detail-page bg-white p20">
    <view v-if="dto.id">
      <view class="delivery-info flex">
        <view class="flex1 desc">
@@ -158,11 +159,13 @@
      </view>
      <view v-for="(item,index) of dto.items" :key="index" class="delivery-order-item m-t-12">
        <view class="flex">
          <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                    <image class="flower-img img100 m-r-6" :src="item.flowerCover"
                        @click="previewImg(item.flowerCover)">
          </image>
          <view class="flex1">
            <view class=" flex">
              <view class="title">{{ item.flowerName }}<span class="level">{{ item.flowerLevelStr }}</span></view>
                            <view class="title">{{ item.flowerName }}<span
                                    class="level">{{ item.flowerLevelStr }}</span></view>
            </view>
            <view class="each-list">
              <view class="each-item">
@@ -190,7 +193,7 @@

        </view>
        <view class="buttons">
          <view class="button" v-for="button of check_status" :key="check_status.value"
                    <view class="button text-center" v-for="button of check_status" :key="button.value"
                @click.stop="clickCheck(item,button.value)">{{ button.label }}
          </view>
        </view>
@@ -217,7 +220,8 @@
              扣款金额
            </view>
            <view class="form-item-value">
              <input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit" class="form-input"></input>
                            <input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
                                class="form-input"></input>

            </view>
          </view>
@@ -225,13 +229,12 @@
            <view class="form-item-label require">
              图片
            </view>
            <view class="form-item-value">
              <u-button type="text" @click="uploadCheckImage()">上传</u-button>
                        <view class="form-item-value m-l-a m-r-0">
                            <view class="t-red" @click="uploadCheckImage()">上传</view>
            </view>
          </view>
          <view class="flex p20"
                v-if="form.checkImageList&&form.checkImageList.length>0">
            <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.checkImageList" :key="index">
                    <view class="flex p20" v-if="form.checkImageList&&form.checkImageList.length>0">
                        <view class="m-t-12 m-r-10 " v-for="(timg,index) of form.checkImageList" :key="index">
              <image class="check-img" :src="timg" @click.stop="previewImg(timg)">
              </image>
              <view class="t-red text-center" @click.stop="deleteCheckImage(index)">删除</view>

 sub_pages/partner/delivery/delivery-home.vue

对比新文件
@@ -0,0 +1,143 @@
<template>
    <view class="main-container user-container">

        <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
            <image class="component-bg"
                src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png"
                mode="scaleToFill" />

            <view class="title" style="position: relative;">
                个人中心

            </view>
            <view class="flex user-info">
                <!-- 头像 -->

                <image class="user-icon" v-if="currentInfo.picture
                    ||currentInfo.customerDTO&&currentInfo.customerDTO.cover
                    ||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
                    " :src="currentInfo.picture
                    ||currentInfo.customerDTO&&currentInfo.customerDTO.cover
                    ||currentInfo.supplierDTO&&currentInfo.supplierDTO.cover" mode="aspectFit"></image>
                <image class="user-icon" v-else
                    src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
                    mode="aspectFit"></image>

                <view class="name" v-if="currentInfo.id">
                    <view class="t1">
                        {{
              (!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") || (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") || currentInfo.nickName || currentInfo.loginName || '-'
            }}<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
                            ({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
                    </view>
                    <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view>
                </view>
                <view class="name" v-if="!currentInfo.id" open-type="getUserInfo" @click.stop="toCustomerLogin"
                    style="font-size: 48rpx;margin-top: 16rpx;">
                    {{ '点击登陆' }}
                </view>
                <image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image>
            </view>
        </view>

        <view class="user-utils m-20">
            <view class="user-util m-t-12 flex" @click="goto('/sub_pages/partner/delivery/delivery',true)">
                <view class="title">质检列表</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
                <view class="title">修改密码</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
			
            <view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype">
                <view class="title">我的客服</view>
                <view class="flex">
                    <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
                    <view class="name" @click="callTel">
                        客服电话 : &nbsp;&nbsp; <span class="topic-gray">{{ tel }}</span>
                    </view>
                    <view class="right-icon" open-type="contact">
                        <uni-icons type="right"></uni-icons>
                    </view>
                </view>
            </view>
        </view>


        <view class="button-login-out topic-gray" @click="clearlogout">
            退出登录
        </view>


    </view>
</template>

<script>
    export default {
        data() {
            return {
                CustomBar: uni.getStorageSync('CustomBar'),
                StatusBar: uni.getStorageSync('StatusBar'),
                tcode: '',
                inviterName: '',
                // StatusBar:0,
                tel: '15974805814',
                tj: {},
                cacheUserId: '',

            };
        },
        // watch: {
        //     currentInfo(nv, ov) {
        //         if (!cacheUserId) {

        //         }
        //     }
        // },
        onShow() {},
        onLoad(options) {
            // const url = options.q ? decodeURIComponent(options.q) : '';
            // const urlcode = options.url && decodeURIComponent(options.url) || ''



        },
        created() {

        },
        async onPullDownRefresh() {
            await this.$store.dispatch('getCurrentInfo')
            uni.stopPullDownRefresh()
        },
        methods: {


            async clearlogout() {
                await this.$message.confirm('是否退出登录?')
                this.$store.commit('updateLogin', false)

                uni.reLaunch({
                    url: '/pages/login/supplier-login'
                })
            },
            async callTel() {
                await this.$message.confirm('是否拨打客服电话')
                uni.makePhoneCall({
                    phoneNumber: this.tel //仅为示例
                });
            },
        }
    }
</script>

<style lang="scss" scoped>
    @import "@/pages/user/user.scss";
</style>

<style lang="scss" scoped>
</style>

 sub_pages/partner/delivery/delivery.vue

@@ -17,7 +17,7 @@
    }
  },
  onLoad() {
    this.listApi = '/api/delivery/list/today'
            this.listApi = '/api/delivery/list'
    this.getList()
    this.$http.request('get', '/api/station/list', {
      params: {}
@@ -49,6 +49,9 @@
    uni.stopPullDownRefresh()
  },
  methods: {
            buttonSearchFlow() {
                this.refreshList()
            },
    select_station(e) {
      this.show_select_station = false
      this.query.stationName = e.value[0].name
@@ -69,15 +72,19 @@
    async compelete(item) {
      await this.$message.confirm("是否完成此单质检")

      const {code, data} = this.$http.request('get', '/api/delivery/list/view/complete', {
                const {
                    code,
                    data
                } = this.$http.request('get', '/api/delivery/list/view/complete', {
        params: {
          id: item.id
        }
      })
      if (code === 0) {
        this.$message.showToast('完成成功')
                    let tmp = this
        setTimeout(() => {
          this.refreshList()
                        tmp.refreshList()
        }, 200)
      }
    }
@@ -90,14 +97,14 @@
    <view class="p15" style="min-height: calc(100vh - 260rpx);">
      <view class="search-container m-t-12 flex">
        <view class="flex1 input">
          <u-input placeholder="请输入花名" v-model="search_flow">
                    <u-input placeholder="请输入供应商名称" v-model="query.supplierName">
            <template slot="suffix">
              <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
            </template>
          </u-input>
        </view>
      </view>
      <view class="component-filter-container">
            <view class="component-filter-container p20 bg-white">
        <view class="flex1" @click="show_select_status=true">
          配送单状态:{{ query.statusStr || '全部' }}
          <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
@@ -111,32 +118,39 @@

      <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
      <view v-for="(item,index) in list" :key="index" class="m-b-24">
        <view class="delivery-item">
          <view class="title">{{ item.supplierName }}</view>
                <view class="delivery-item bg-white br-4 p10">
                    <view class="title">供应商：{{ item.supplierName }}</view>
          <view class="line-gray"></view>
          <view class="form-item">
            <view class="form-item-label">订单单号:</view>
                        <view class="form-item-label">订单单号</view>
            <view class="form-item-value">{{ item.orderNo || '-' }}</view>
          </view>
          <view class="form-item">
            <view class="form-item-label">集货站名称:</view>
                    <view class="flex">
                        <view class="form-item flex1">
                            <view class="form-item-label">集货站</view>
            <view class="form-item-value">{{ item.stationName || '-' }}</view>
          </view>
          <view class="form-item">
            <view class="form-item-label">配送单状态:</view>
            <view class="form-item-value">{{ item.levelStr || '-' }}</view>

          </view>
          <view class="form-item">
            <view class="form-item-label">送达时间</view>
            <view class="form-item-value">{{ item.arriveTime || '-' }}</view>
                    <view class="flex">
                        <view class="form-item flex1">
                            <view class="form-item-label">状态</view>
                            <view class="form-item-value">{{ item.statusStr || '-' }}</view>
          </view>
          <view class="form-item">
                        <view class="form-item flex1">
            <view class="form-item-label">供货总数</view>
            <view class="form-item-value">{{ item.totalNum || '-' }}</view>
          </view>
          <view class="line-gray"></view>
          <view class="flex">
            <view class="button button-2 m-l-a m-r-0" @click="toDetail(item)">前往质检</view>
                    </view>
                    <view class="form-item flex1">
                        <view class="form-item-label">送达时间</view>
                        <view class="form-item-value">{{ item.arriveTime || '-' }}</view>
                    </view>


                    <view class="line-gray" v-if="item.status==='ARRIVED'"></view>
                    <view class="flex buttons" v-if="item.status==='ARRIVED'">
                        <view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">前往质检</view>
            <view class="button button-1 m-l-15 m-r-0" @click="compelete(item)">质检完成</view>
          </view>
        </view>
@@ -147,8 +161,8 @@
    <footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
    <u-picker @confirm="select_station" keyName="name" @cancel="show_select_station=false"
              :show="show_select_station" :columns="columns_station"></u-picker>
    <u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false"
              :show="show_select_status" :columns="status_columns"></u-picker>
        <u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false" :show="show_select_status"
            :columns="status_columns"></u-picker>


  </view>
@@ -158,21 +172,56 @@
.page-delivery {
  .delivery-item {
    .title {
      font-weight: 400;
      font-size: 28rpx;
                font-weight: 600;
                font-size: 32rpx;
      color: #000000;
      line-height: 40rpx;
    }

            .form-item {
                line-height: 40rpx;
                font-size: 28rpx;
                color: #666;
                display: flex;

                .form-item-label {
                    min-width: 120rpx;
                }

                .form-item-label::after {
                    content: ":";
                    margin-right: 20rpx;
                }
            }

            .buttons {
                display: flex;
                margin-left: auto;
                width: fit-content;

    .button {
      min-width: 122rpx;
      text-align: center;
      height: 48rpx;
      line-height: 48rpx;
      border-radius: 28rpx;
      border: 2rpx solid #20613D;
                    // width: 216rpx;
                    padding: 10rpx 20rpx;
                    line-height: 34rpx;
      font-size: 24rpx;
      color: #20613D;
                    height: 34rpx;
                    background: #20613D;
                    text-align: center;
                    border-radius: 30rpx;

                }

                .button-1 {
                    background: #fff;
                    color: #333;
                    border: 2rpx solid #333;

                }

                .button-0 {
                    color: #fff;
                    border: 2rpx solid #20613D;
                }
    }
  }

@@ -203,5 +252,4 @@
    }
  }
}

</style>

 sub_pages/partner/markup-config/markup-config.vue

@@ -1,15 +1,18 @@
<template>

  <view class="list-container markup-config">

    <view class="list-container markup-config p20">

    <view class="search-container m-t-12 flex">

      <view class="flex1 input">

        <u--input placeholder="请输入商品名称" v-model="query.name">

        </u--input>

                <u-input placeholder="请输入分类名称" v-model="query.name" clearable>

                    <template slot="suffix">

                        <uni-icons color="#20613D" type="search" size="24" @tap="refreshList"></uni-icons>

                    </template>

                </u-input>

      </view>

      <view class="button" @click="refreshList">搜索</view>

    </view>

    <view class="m-t-12">



<!--         <view class="m-t-12 text-center bg-white p10" @click="show_time_picker_time=true">

      {{ !query.time && '请选择时间' || (query.time) }}

    </view>

        </view> -->





    <view class="p15" style="min-height: calc(100vh - 160rpx);">

@@ -69,7 +72,7 @@
    <!-- 判断是否到底了，自动吧 -->

    <footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>

    <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"

                       @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="time"></u-datetime-picker>

            @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="datetime"></u-datetime-picker>



  </view>

</template>

@@ -104,6 +107,7 @@
  },

  methods: {

    async select_time_picker_time(e) {

                console.log('select_time_picker_time', e)

      var vv = e.value

      if (vv) {

        vv = vv.replace('aN:', '00:')

@@ -125,7 +129,8 @@
.list-container.markup-config {

  .search-container {

    display: flex;

    margin: 24rpx 30rpx 20rpx 30rpx;

            // margin: 24rpx 30rpx 20rpx 30rpx;





    .input {

      // flex: 1;

@@ -140,7 +145,7 @@
      max-width: 120rpx;

      margin-left: auto;

      margin-right: 0rpx;

      text-align: right;

                // text-align: right;

      line-height: 70rpx !important;

      // height: 58rpx !important;

      // display: flex;

@@ -212,11 +217,9 @@
          max-width: 50%;

          flex: 1;



          .form-item-label {

          }

                        .form-item-label {}



          .form-item-value {

          }

                        .form-item-value {}

        }



      }


 sub_pages/partner/order-manage/order-manage.vue

@@ -72,7 +72,7 @@
    }
  },
  onLoad() {
    this.listApi = `/api/partner/list`
    this.listApi = `/api/partner/order/list`
    this.getList()

  },

 sub_pages/supplier/order-sale/order-sale-detail.vue

对比新文件
@@ -0,0 +1,404 @@
<script>
    export default {
        data() {
            return {
                id: '',
                dto: {},
                type: '',
                // #ifdef PUB_CUSTOMER
                type: 'customer',
                // #endif
                // #ifdef PUB_PARTNER
                type: 'partner',
                // #endif
            };
        },
        async onLoad(options) {
            console.log('options', options)
            this.id = options.id || ''
            if (this.id) {
                await this.getDetail()
                this.getItemList()
            }
        },
        methods: {

            async getDetail() {
                this.$message.showLoading()
                const {
                    code,
                    data
                } = await this.$http.request('get', `/api/${this.type}/sales/list/view`, {
                    params: {
                        id: this.id
                    }
                })
                this.$message.hideLoading()
                console.log('getDetail', data)
                if (code === 0) {
                    this.dto = {
                        ...this.dto,
                        ...data,
                        items: data.items || []
                    }
                }
            },


        },
    }
</script>

<template>
    <view class="order-detail-page">
        <view class="address-container bg-white br-4 m-t-12">
            <view class="flex">
                <image src="/static/common/icon-loc.png" class="image  m-r-10"></image>
				
        <!--         <view class="icon-loc m-r-10">
                    <image src="/static/common/icon-loc.png" class="image"></image>
                </view> -->
                <view class="info">
                    <view class="title">
                        {{ dto.customer }}
                        <view class="tel">{{ dto.customerTel }}</view>
                    </view>
                    <view class="content">{{ dto.customerAddress }}</view>
                </view>
            </view>
        </view>
        <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of dto.items" :key="index">
            <view class="supplier-name ">
                <image class="icon-dp" src="/static/common/icon-dp.png"></image>
                {{ item.supplierName }}
            </view>
            <view class="flex m-t-12">
                <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
                </image>
                <view class="flex1">
                    <view class=" flex">
                        <view class="title"><span class="level">{{ item.flowerCategory }}</span><span
                                class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
                        </view>
                    </view>
                    <view class="each-list">
                        <view class="each-item">
                            <view class="label">颜色</view>
                            <view class="value">{{ item.flowerColor || '-' }}</view>

                        </view>
                        <view class="each-item">
                            <view class="label">规格</view>
                            <view class="value">{{ item.flowerUnit || '-' }}</view>
                        </view>

                        <view class="each-item">
                            <view class="label">数量</view>
                            <view class="value">{{ item.num || 0 }}</view>

                        </view>
                        <view class="each-item">
                            <view class="label">售价</view>
                            <view class="value">￥{{ item.price || 0 }}</view>
						
                        </view>
                        <view class="each-item">
                            <view class="label">商品总金额</view>
                            <view class="value">￥{{ item.total || 0 }}</view>
						
                        </view>
                        <view class="each-item">
                            <view class="label">责任方</view>
                            <view class="value">{{ item.personInChargeStr || '-' }}</view>
                        </view>
                        <view class="each-item">
                            <view class="label">备注</view>
                            <view class="value">{{ item.remarks || '-' }}</view>
                        </view>
                        <view class="each-item">
                            <view class="label">赔付金额</view>
                            <view class="value t-red">￥{{ item.amount || '-' }}</view>
                        </view>
                    </view>
                </view>
            </view>

        </view>

        <view class="info-container bg-white br-4">
            <view class="form-item">
                <view class="label">订单编号:</view>
                <view class="value">{{ dto.orderNo || '-' }}</view>
                <view class="button m-l-a m-r-0" @click="copyTxt(dto.orderNo)">复制
                </view>
            </view>
            <view class="form-item">
                <view class="label">状态:</view>
                <view class="value">{{ dto.statusStr || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">订单金额:</view>
                <view class="value">{{ dto.totalOrderAmount || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">理由:</view>
                <view class="value">{{ dto.reason || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">提交人:</view>
                <view class="value">{{ dto.createName || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">提交时间:</view>
                <view class="value">{{ dto.createTime || '-' }}</view>
            </view>
        </view>

        <view class="info-container bg-white br-4">

            <view class="form-item">
                <view class="label">售后单号:</view>
                <view class="value">{{ dto.salesNo || '-' }}</view>
                <view class="button m-l-a m-r-0" @click="copyTxt(dto.salesNo)">复制
                </view>
            </view>

            <view class="form-item">
                <view class="label">审核时间:</view>
                <view class="value">{{ dto.auditTime || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">审核状态:</view>
                <view class="value">{{ dto.auditStatusStr || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">审核备注:</view>
                <view class="value">{{ dto.auditRemarks || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">总赔付金额:</view>
                <view class="value">{{ dto.totalAmount || '-' }}</view>
            </view>
            <view class="form-item">
                <view class="label">转账状态:</view>
                <view class="value">{{ dto.transferStatusStr || '-' }}</view>
            </view>

        </view>



    </view>
</template>

<style lang="scss" scoped>
    .order-detail-page {
        background: #F7F7F7;
        padding: 30rpx;

        .info-container {
            .button-space {
                min-height: 140rpx;
            }

            .icon-kf {
                width: 44rpx;
                height: 44rpx;
            }

            .icon-call {
                width: 32rpx;
                height: 32rpx;
            }

            .icon-view {
                line-height: 40rpx;

                .icon {
                    display: inline-block;
                    vertical-align: middle;
                }
            }

            .buttons-bottom {
                position: fixed;
                left: 0;
                bottom: 0;
                right: 0;
                height: 120rpx;

                .button {
                    border-radius: 42rpx;
                    border: 2rpx solid #CECECE;
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #999999;
                    text-align: center;
                    line-height: 76rpx;
                }

                .button-1 {}
            }
        }

        .info-container {
            padding: 28rpx;

            .form-item {
                font-weight: 400;
                font-size: 28rpx;
                color: #666666;
                line-height: 60rpx;
                display: flex;

                .label {
                    min-width: 140rpx;
                    margin-right: 20rpx;
                }

                .value {
                    word-break: break-all;
                }
            }

            .line {
                height: 2rpx solid #EEEEEE;
            }
        }

        .top-tip {
            .icon-car {
                width: 52rpx;
                height: 52rpx;
            }
        }

        .address-container {
            padding: 28rpx;
.image {
                // background-color: #20613D;
                border-radius: 50%;
                margin-top: 8rpx;
                margin-left: 8rpx;
                width: 32rpx;
                height: 32rpx;
                // padding: 8rpx;
            }
            // .icon-loc {
            //     width: 48rpx;
            //     height: 48rpx;
            //     background: #20613D;
            //     border-radius: 50%;

            //     .image {
            //         margin-top: 8rpx;
            //         margin-left: 8rpx;
            //         width: 32rpx;
            //         height: 32rpx;
            //     }
            // }

            .info {
                .title {
                    font-weight: 600;
                    font-size: 32rpx;
                    color: #000000;
                    line-height: 44rpx;

                    .tel {
                        display: inline-block;
                        margin-left: 20rpx;
                    }
                }

                .content {
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #000000;
                    line-height: 40rpx;
                }

            }
        }

        .flower-info {
            padding: 28rpx;

            background: #FFFFFF;
            border-radius: 8rpx;

            .supplier-name {
                border-bottom: 2rpx solid #EEEEEE;
                font-weight: 600;
                font-size: 28rpx;
                color: #000000;
                padding-bottom: 10rpx;
                line-height: 40rpx;

                .icon-dp {
                    width: 27rpx;
                    height: 27rpx;
                    display: inline-block;
                    vertical-align: middle;
                }
            }

            .title {
                font-weight: 600;
                font-size: 28rpx;
                color: #000000;
                line-height: 40rpx;

                .level {
                    font-weight: 400;
                    font-size: 28rpx;
                    color: #20613D;
                    line-height: 40rpx;
                    margin-right: 20rpx;
                }
            }

            .flower-img {
                width: 128rpx;
                height: 118rpx;
                min-width: 128rpx;
                min-height: 118rpx;
            }

            .each-list {
                display: flex;
                flex-wrap: wrap;
                margin-top: 6rpx;

                .each-item {
                    min-width: 30%;
                    max-width: 40%;
                    text-align: center;
                    margin-left: 0rpx;
                    margin-right: auto;
                    display: flex;

                    .label {
                        font-weight: 400;
                        font-size: 24rpx;
                        color: #666666;
                        text-align: left;
                        padding-right: 10rpx;
                    }

                    .label::after {
                        content: ": "
                    }

                    .value {
                        font-weight: 400;
                        font-size: 24rpx;
                        color: #666666;
                    }
                }
            }

        }

    }
</style>

 sub_pages/supplier/order-sale/order-sale.vue

@@ -6,7 +6,8 @@
        </view> -->
        <view class="p15" style="min-height: calc(100vh - 160rpx);">
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
            <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
                class="m-b-24 order-sale-list list-container">
                <view class="order-sale-item br-4 list-item bg-white">
                    <view class="title flex">
                        <view>售后单号:{{item.salesNo}}</view>
@@ -91,9 +92,9 @@
                }
            },
            toDetail(item) {
                // uni.navigateTo({
                //     url: `/pages/notice/notice?id=${item.id}`
                // })
                uni.navigateTo({
                    url: `/sub_pages/supplier/order-sale/order-sale-detail?id=${item.id}`
                })
            }
        }
    }

 sub_pages/supplier/order-settlement/order-settlement-detail.vue

对比新文件
@@ -0,0 +1,225 @@
<template>
    <view class="list-container order-sale supplier p20">
        <view class="m-b-24 order-sale-list list-container">
            <view class="order-sale-item br-4 m-t-12 list-item bg-white">
                <view class="title flex">
                    <view class="title">
                        <image src="/static/common/icon-date.png" class="icon-date m-r-10 image"></image>
                        转账日期:{{dto.createTime}}
                    </view>
                </view>
                <view class="line"></view>
                <view class="form">
                    <view class="flex">
                        <view class="form-item flex1">
                            <view class="label">结算单价/均价</view>
                            <view class="value">￥{{dto.price||'0.00'}}</view>
                        </view>
                        <view class="form-item flex1">
                            <view class="label">商品数量</view>
                            <view class="value">{{dto.flowerNum||0}}</view>
                        </view>
                    </view>
                    <view class="flex">
                        <view class="form-item">
                            <view class="label">订单数量</view>
                            <view class="value">{{dto.orderNum}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">买家数量</view>
                            <view class="value">{{dto.customerNum}}</view>
                        </view>
                    </view>
                    <view class="flex">
                        <view class="form-item">
                            <view class="label">服务费</view>
                            <view class="value">{{dto.serviceFee}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">售后理赔</view>
                            <view class="value">{{dto.salesFee}}</view>
                        </view>
                    </view>
                    <view class="flex">
                        <view class="form-item">
                            <view class="label">质检扣款</view>
                            <view class="value">{{dto.checkFee}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label">集货站运费</view>
                            <view class="value">{{dto.stationFee}}</view>
                        </view>
                    </view>
                </view>

                <view class="line"></view>
                <view class="form">
                    <view class="flex">
                        <view class="form-item">
                            <view class="label title-bold">交易合计</view>
                            <view class="value t-red">￥{{dto.totalAmount||0}}</view>
                        </view>
                        <view class="form-item">
                            <view class="label title-bold">结算金额</view>
                            <view class="value t-red">￥{{dto.settlementAmount||0}}</view>
                        </view>
                    </view>
                </view>
            </view>
        </view>
		
        <view class="m-b-24 order-sale-list list-container">
            <view class="order-sale-item br-4 m-t-12 list-item bg-white">
                <view class="title flex">
                    结算商品明细
                </view>
                <view v-for="(item,index) of dto.details" :key="index" class="p10">
                    <view class="line"></view>
                    <view class="form">
                        <view class="form-item flex">
                            <view class="label">商品名称</view>
                            <view class="value">{{item.flowerName||'-'}}</view>
                        </view>
                        <view class="flex">
                            <view class="form-item flex1">
                                <view class="label">结算单价</view>
                                <view class="value">￥{{item.price||'0.00'}}</view>
                            </view>
                            <view class="form-item flex1">
                                <view class="label">商品数量</view>
                                <view class="value">{{item.num||0}}</view>
                            </view>
                        </view>
                        <view class="flex">
                            <view class="form-item">
                                <view class="label">结算合计</view>
                                <view class="value">￥{{item.totalAmount||0}}</view>
                            </view>
                            <view class="form-item">
                                <view class="label">质检扣款</view>
                                <view class="value">￥{{item.checkFee||'0.00'}}</view>
                            </view>
                        </view>
                        <view class="flex">
                            <view class="form-item">
                                <view class="label">集货站运费</view>
                                <view class="value">￥{{item.stationFee||'0.00'}}</view>
                            </view>
                            <view class="form-item">
                                <view class="label">售后理赔</view>
                                <view class="value">￥{{item.salesFee||'0.00'}}</view>
                            </view>
                        </view>
                    </view>
							
                </view>
				
            </view>
        </view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
                id: '',
                dto: {

                }
            }
        },
        onLoad(options) {
            this.id = options.id || ''
            if (this.id)
                this.getList()

        },

        methods: {
            async getDetail() {
                this.$message.showLoading()
                const {
                    code,
                    data
                } = await this.$http.request('get', '/api/partner/settlement/list/view?id=' + this.id, {

                })

                this.$message.hideLoading()
                if (code == 0) {
                    this.dto = {
                        ...data,
                        details:data.details||[]
                    }
                }


            }
        }
    }
</script>

<style lang="scss" scope>
    .order-sale-list {
        .order-sale-item {
            margin-bottom: 20rpx;
            padding: 22rpx;

            .title {
                font-weight: 600;
                font-size: 28rpx;
                color: #000000;
                line-height: 40rpx;
            }

            .line {
                min-height: 2rpx;
                background-color: #EEEEEE;
                margin-top: 16rpx;
                margin-bottom: 16rpx;
            }

            .form {
                display: flex;
                flex-wrap: wrap;

                .form-item {
                    flex: 1;
                    // min-width: 40%;
                    // max-width: 50%;

                    .label {
                        font-weight: 400;
                        font-size: 24rpx;
                        color: #666666;
                        line-height: 34rpx;
                    }

                    .label::after {
                        content: ":";
                        font-weight: 400;
                        font-size: 24rpx;
                        color: #666666;
                        line-height: 34rpx;
                    }

                    .value {
                        font-weight: 400;
                        font-size: 24rpx;
                        color: #000000;
                        line-height: 34rpx;
                    }

                    .value.red {
                        color: #CF0000;
                    }
                }

                .form-item.width100 {
                    max-width: unset;
                }
            }
        }
    }
</style>

 sub_pages/supplier/order-settlement/order-settlement.vue

@@ -6,7 +6,8 @@
        </view>
        <view class="p15" style="min-height: calc(100vh - 160rpx);">
            <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
            <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
            <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
                class="m-b-24 order-sale-list list-container">
                <view class="order-sale-item br-4 list-item bg-white">
                    <view class="title flex">
                        <view class="title">
@@ -94,9 +95,10 @@
            }
        },
        onLoad() {
            var currentMonthStr = this.$util.toDate(new Date())
            var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
            this.query.startDateStr = currentMonthStr
            var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
            var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() + 3600_000 * 24 *
                40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
            this.query.endDateStr = this.$util.toDate(lastMonthDate)
            
            this.listApi = '/api/partner/settlement/list'
@@ -113,14 +115,20 @@
            uni.stopPullDownRefresh()
        },
        methods: {
            toDetail(item) {
                uni.navigateTo({
                    url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
                })
            },
            changeIndex(index) {
                if (this.tabIndex !== index) {
                    this.tabIndex = index
                    // 刷新 query
                    if(index===0){
                        var currentMonthStr = this.$util.toDate(new Date())
                        var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
                        this.query.startDateStr = currentMonthStr
                        var lastMonthDate = new Date(new Date(currentMonthStr).getTime() - 3600_000*24*10)
                        var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() +
                            3600_000 * 24 * 40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
                        this.query.endDateStr = this.$util.toDate(lastMonthDate)
                    }else{
                        this.query.startDateStr = ''

			@@ -26,9 +26,16 @@
			const res = await this.$store.dispatch('getCurrentInfo');
			// #ifndef PUB_CUSTOMER
			if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
			if(this.currentInfo.type==='admin'){
			uni.reLaunch({
			url: '/sub_pages/partner/delivery/delivery-home'
			})
			}else{
			uni.reLaunch({
			url: '/pages/home/supplier-home'
			})
			}

			} else {
			uni.reLaunch({
			url: '/pages/login/supplier-login'

			@@ -144,6 +144,23 @@
			},

			{
			"path": "order-records/order-records",
			"style": {
			"navigationBarTitleText": "扣款记录",
			"enablePullDownRefresh": true,
			"navigationBarBackgroundColor": "#E6F2EB"
			}
			},
			{
			"path": "protocol",
			"style": {
			"navigationBarTitleText": "协议",
			"enablePullDownRefresh": false
			}
			},
			// #endif
			// #ifdef PUB_PARTNER \|\| PUB_SUPPLIER
			{
			"path": "order-settlement/order-settlement",
			"style": {
			"navigationBarTitleText": "账单结算",
			@@ -158,18 +175,17 @@
			}
			},
			{
			"path": "order-records/order-records",
			"style": {
			"navigationBarTitleText": "扣款记录",
			"enablePullDownRefresh": true,
			"navigationBarBackgroundColor": "#E6F2EB"
			"path" : "order-settlement/order-settlement-detail",
			"style" :
			{
			"navigationBarTitleText" : "结算单详情"
			}
			},
			{
			"path": "protocol",
			"style": {
			"navigationBarTitleText": "协议",
			"enablePullDownRefresh": false
			"path": "order-sale/order-sale-detail",
			"style" :
			{
			"navigationBarTitleText" : "理赔单详情"
			}
			}
			// #endif
			@@ -213,6 +229,13 @@
			"navigationBarTitleText": "质检详情",
			"enablePullDownRefresh": true
			}
			},
			{
			"path": "delivery/delivery-home",
			"style": {
			"navigationBarTitleText": "",
			"navigationStyle": "custom"
			}
			}
			// #endif
			]

			@@ -102,7 +102,7 @@
			</view>
			</view>
			</view>
			<view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;">
			<view class="item-container flex m-t-12" style="padding: 34rpx 44rpx;" v-if="selftype=='supplier'">
			<view class="rate-view flex1" style="max-width: 140rpx;">
			<view class="title">售后率</view>
			<view class="title" style="color: red;">{{tj.salesRate\|\|0}}%</view>
			@@ -163,13 +163,13 @@
			</view>
			<view class="order-desc syst">售后理赔</view>
			</view>
			<view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-records/order-records',true)">
			<!-- <view class="nav row margin-tb" @click="goto('/sub_pages/supplier/order-records/order-records',true)">
			<view class="img-c">
			<image class="icon margin-bottom order-icon kkjl"
			src="/static/images/supplier/user/user-icon-kkjl.png" mode="scaleToFill" />
			</view>
			<view class="order-desc wbsp">扣款记录</view>
			</view>
			</view> -->
			</view>
			</view>

			@@ -26,16 +26,11 @@

			</view>
			<view class="t-a input form-input" v-if="loginType=='pwd'">
			<!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
			<u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>
			</view>
			<view class="t-a input form-input" v-if="loginType=='code'">


			<!-- <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />
			<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
			{{getCodeText}}
			</view> -->
			<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
			<template slot="suffix">
			<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
			@@ -47,22 +42,34 @@


			<view class="t-a form-input" v-if="loginType=='code'">
			<!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->
			<u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>

			</view>


			<button @tap="login()" class="bottom-button">登录</button>

			<view class="flex">
			<view class="topic-font" v-if="loginType=='pwd'" @click="loginType='code'">手机验证码登录</view>
			<view class="topic-font" v-if="loginType=='code'" @click="loginType='pwd'">账号密码登录</view>
			<view class="topic-font" v-if="loginType=='pwd'&&apitype!=='loginAdmin'" @click="loginType='code'">手机验证码登录</view>
			<view class="topic-font" v-if="loginType=='code'&&apitype!=='loginAdmin'" @click="loginType='pwd'">账号密码登录</view>

			<view class="topic-font m-l-a m-r-0" @click="toReg">前往注册</view>
			<view class="topic-font m-l-a m-r-0" v-if="apitype!=='loginAdmin'" @click="toReg">前往注册</view>

			<!-- #ifdef PUB_CUSTOMER -->
			<view class="topic-font m-l-a m-r-0" @click="toHome">返回首页</view>
			<!-- #endif -->
			<!-- #ifdef PUB_PARTNER -->
			<view class="topic-font m-l-a m-r-0" @click="()=>{
			if(apitype==='loginPartner'){
			apitype = 'loginAdmin'
			loginType = 'pwd'
			}else{
			apitype = 'loginPartner'
			}
			}">
			切换为{{apitype!=='loginPartner'?'合伙人':'质检人员'}}登录
			</view>
			<!-- #endif -->
			</view>

			</form>

			@@ -141,8 +141,9 @@
			}
			break
			case 'evaluate': {
			const res = await this.$message.confirm('请输入评价信息', {
			editable: true
			const res = await this.$message.confirm('', {
			editable: true,
			title:'请输入评价信息'
			})
			if (res.content && res.confirm) {
			// 发送请求
			@@ -190,9 +191,8 @@
			</view>
			<view class="address-container bg-white br-4 m-t-12">
			<view class="flex">
			<view class="icon-loc m-r-10">
			<image src="/static/common/icon-loc.png" class="image"></image>
			</view>
			<image src="/static/common/icon-loc.png" class="image m-r-10"></image>

			<view class="info">
			<view class="title">
			{{ dto.customer }}
			@@ -212,7 +212,8 @@
			</image>
			<view class="flex1">
			<view class=" flex">
			<view class="title"><span class="level">{{ item.flowerCategory }}</span><span class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
			<view class="title"><span class="level">{{ item.flowerCategory }}</span><span
			class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
			</view>
			<!-- <view class="m-l-a m-r-0">-->
			<!-- {{item.flowerCategory \|\| '-'}}-->
			@@ -351,8 +352,6 @@
			</view>
			<view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
			</view>
			<view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
			</view>
			<!-- <view class="button button-1" @click="buttonClick('couldRefund')"
			v-if="dto.couldRefund"> 退款
			</view> -->
			@@ -370,10 +369,42 @@
			background: #F7F7F7;
			padding: 30rpx;

			.info-container {
			.button-space {
			min-height: 140rpx;
			}

			.buttons-bottom {
			position: fixed;
			left: 0;
			bottom: 0;
			right: 0;
			height: 120rpx;
			background-color: #FFFFFF;
			box-shadow: 0 2rpx 30rpx rgba(0, 0, 0, .3);

			.button {
			border-radius: 42rpx;
			border: 2rpx solid #CECECE;
			font-weight: 400;
			font-size: 30rpx;
			color: #999999;
			text-align: center;
			line-height: 60rpx;
			height: 60rpx;
			padding: 10rpx 30rpx;
			background-color: #FFFFFF;
			margin: 0 auto;
			display: inline-block;
			vertical-align: middle;
			margin-top: 20rpx;
			min-width: 120rpx;
			}

			.button-1 {}
			}

			.info-container {


			.icon-kf {
			width: 44rpx;
			@@ -394,25 +425,6 @@
			}
			}

			.buttons-bottom {
			position: fixed;
			left: 0;
			bottom: 0;
			right: 0;
			height: 120rpx;

			.button {
			border-radius: 42rpx;
			border: 2rpx solid #CECECE;
			font-weight: 400;
			font-size: 28rpx;
			color: #999999;
			text-align: center;
			line-height: 76rpx;
			}

			.button-1 {}
			}
			}

			.info-container {
			@@ -450,18 +462,14 @@
			.address-container {
			padding: 28rpx;

			.icon-loc {
			width: 48rpx;
			height: 48rpx;
			background: #20613D;
			border-radius: 50%;

			.image {
			// background-color: #20613D;
			border-radius: 50%;
			margin-top: 8rpx;
			margin-left: 8rpx;
			width: 32rpx;
			height: 32rpx;
			}
			// padding: 8rpx;
			}

			.info {

			@@ -156,8 +156,8 @@
			line-height: 40rpx;
			margin: 0 auto;
			//min-width: ;
			padding-left: 20rpx;
			padding-right: 20rpx;
			// padding-left: 10rpx;
			// padding-right: 10rpx;
			width: fit-content;
			min-width: 120rpx;
			text-align: center;
			@@ -167,7 +167,7 @@
			font-weight: 600;
			font-size: 32rpx;
			color: #20613D;
			line-height: 44rpx;
			// line-height: 44rpx;
			}

			.status-each:first-child {

			@@ -31,8 +31,11 @@
			<view class="t1">
			{{
			(!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") \|\| (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") \|\| currentInfo.nickName \|\| currentInfo.loginName \|\| '-'
			}}<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
			}}
			<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
			({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
			<span v-if="currentInfo.partnerDTO&&currentInfo.partnerDTO.status!=='P'">
			({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span>
			</view>
			<view class="t2">{{ currentInfo.tel \|\| '暂无电话' }}</view>
			</view>
			@@ -145,7 +148,8 @@
			</view>
			<!-- #endif -->
			<view class="user-utils m-20">
			<view class="user-util m-t-12 flex" @click="goto('/sub_pages/customer/customer-info/customer-info',true)">
			<view class="user-util m-t-12 flex" v-if="selftype==='customer'\|\|!selftype"
			@click="goto('/sub_pages/customer/customer-info/customer-info',true)">
			<view class="title">个人信息</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>

			@@ -258,47 +258,47 @@
			clientType: data.clientType \|\| 'app'
			}
			})
			console.log('resp', resp)
			if (resp && resp.code == 0) {
			// await getCurrentInfo()
			// // this.$message.showToast('登录成功')
			// console.log(resp)
			storage.setItem('token', resp.data.access_token)
			commit("updateLogin", true)
			await dispatch('getCurrentInfo')

			console.log('login,reLaunch')
			// #ifdef APP
			var KeepAliveModule = uni.requireNativePlugin("yh-nl") //保活组件

			KeepAliveModule && KeepAliveModule.startLocation({
			intervalTime: 5000, //定位间隔时间
			gaodeApiKey: "0eef1axxxxxx7964", //高德地图Key，已停用，引入插件配置
			locationMode: 1, //定位模式
			purpose: 0, //定位场景
			ifUpload: true, //是否上报服务器
			uploadUrl: "http://bio51-api.fixbug.fun/api/current/employee/location", //上报接口
			params: "{'lat':'1','lng':'3'}", //其他参数
			headers: "{'authorization1':'Bearer xOHeJhg'}",
			}, function (res) {
			console.log("启用结果：", res);
			let ret = KeepAliveModule.getCurrentLocation();
			console.log("启用结果2：", ret);
			});
			// #endif
			// uni.redirectTo({
			// url: '/views/app/app-home/app-home'
			// })
			uni.reLaunch({
			url: '/pages/home/supplier-home'
			})
			} else {
			// this.$message.showToast('登录失败')

			}
			} else {}
			return resp
			}

			},
			loginAdmin: async function({
			commit,
			dispatch,
			state
			}, data) {
			{
			// + ((data
			// .phoneNumber \|\| data.tel) ? '/phone' : '')
			const resp = await http.request('post', '/api/login/admin/wx', {
			data: {
			username: (data.phoneNumber \|\| data.tel) ? (data.phoneNumber \|\|
			data.tel) : data.username,
			password: data.password,
			tel: data.phoneNumber \|\| data.tel,
			smsCode: data.smsCode \|\| ''
			},
			params: {
			clientType: data.clientType \|\| 'app'
			}
			})
			if (resp && resp.code == 0) {
			storage.setItem('token', resp.data.access_token)
			commit("updateLogin", true)
			await dispatch('getCurrentInfo')
			uni.reLaunch({
			url: '/sub_pages/partner/delivery/delivery-home'
			})
			} else {}
			return resp
			}
			},
			loginSupplier: async function ({
			commit,
			@@ -397,14 +397,16 @@
			}

			},
			submitShopping: async function ({commit, dispatch}, data) {
			submitShopping: async function({
			commit,
			dispatch
			}, data) {
			const resp = await http.request('post', '/api/customer/flower/cart/change-num', {
			data: {
			id: data.id,
			num: 1
			}
			}
			)
			})
			if (resp && resp.code === 0) {
			message.showToast('添加购物车成功')
			dispatch('sign_add', 'shopping')

			@@ -18,8 +18,7 @@
			checkRemarks: '',
			deductAmount: 0,
			},
			check_status: [
			{
			check_status: [{
			label: '退回',
			value: 'back'
			},
			@@ -55,7 +54,7 @@
			async clickCheck(item, status) {
			this.form = {
			id: item.id \|\| '',
			status: '',
			status: status,
			statusStr: '',
			checkImageList: item.checkImageList \|\| [],
			checkRemarks: item.checkRemarks \|\| '',
			@@ -78,9 +77,10 @@
			this.$message.showLoading()
			const {
			code
			} = await this.$http.request('get', '/api/delivery/list/view/check', {
			} = await this.$http.request('post', '/api/delivery/list/view/check', {
			data: {
			...this.form
			...this.form,
			deductAmount: parseFloat(this.form.deductAmount) \|\| 0
			}
			})
			this.$message.hideLoading()
			@@ -131,6 +131,7 @@
			.url \|\| ''
			that.$message.hideLoading()
			that.form.checkImageList.push(pic)
			console.log('form', that.form)
			that.$forceUpdate()
			}).catch(res => {
			that.$message.hideLoading()
			@@ -144,7 +145,7 @@
			}
			</script>
			<template>
			<view class="delivery-detail-page">
			<view class="delivery-detail-page bg-white p20">
			<view v-if="dto.id">
			<view class="delivery-info flex">
			<view class="flex1 desc">
			@@ -158,11 +159,13 @@
			</view>
			<view v-for="(item,index) of dto.items" :key="index" class="delivery-order-item m-t-12">
			<view class="flex">
			<image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
			<image class="flower-img img100 m-r-6" :src="item.flowerCover"
			@click="previewImg(item.flowerCover)">
			</image>
			<view class="flex1">
			<view class=" flex">
			<view class="title">{{ item.flowerName }}<span class="level">{{ item.flowerLevelStr }}</span></view>
			<view class="title">{{ item.flowerName }}<span
			class="level">{{ item.flowerLevelStr }}</span></view>
			</view>
			<view class="each-list">
			<view class="each-item">
			@@ -190,7 +193,7 @@

			</view>
			<view class="buttons">
			<view class="button" v-for="button of check_status" :key="check_status.value"
			<view class="button text-center" v-for="button of check_status" :key="button.value"
			@click.stop="clickCheck(item,button.value)">{{ button.label }}
			</view>
			</view>
			@@ -217,7 +220,8 @@
			扣款金额
			</view>
			<view class="form-item-value">
			<input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit" class="form-input"></input>
			<input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
			class="form-input"></input>

			</view>
			</view>
			@@ -225,13 +229,12 @@
			<view class="form-item-label require">
			图片
			</view>
			<view class="form-item-value">
			<u-button type="text" @click="uploadCheckImage()">上传</u-button>
			<view class="form-item-value m-l-a m-r-0">
			<view class="t-red" @click="uploadCheckImage()">上传</view>
			</view>
			</view>
			<view class="flex p20"
			v-if="form.checkImageList&&form.checkImageList.length>0">
			<view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.checkImageList" :key="index">
			<view class="flex p20" v-if="form.checkImageList&&form.checkImageList.length>0">
			<view class="m-t-12 m-r-10 " v-for="(timg,index) of form.checkImageList" :key="index">
			<image class="check-img" :src="timg" @click.stop="previewImg(timg)">
			</image>
			<view class="t-red text-center" @click.stop="deleteCheckImage(index)">删除</view>

对比新文件
			@@ -0,0 +1,143 @@
			<template>
			<view class="main-container user-container">

			<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
			<image class="component-bg"
			src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/21/21c95c14e9504be69edff7785e3b44a9bg.png"
			mode="scaleToFill" />

			<view class="title" style="position: relative;">
			个人中心

			</view>
			<view class="flex user-info">
			<!-- 头像 -->

			<image class="user-icon" v-if="currentInfo.picture
			\|\|currentInfo.customerDTO&&currentInfo.customerDTO.cover
			\|\|currentInfo.supplierDTO&&currentInfo.supplierDTO.cover
			" :src="currentInfo.picture
			\|\|currentInfo.customerDTO&&currentInfo.customerDTO.cover
			\|\|currentInfo.supplierDTO&&currentInfo.supplierDTO.cover" mode="aspectFit"></image>
			<image class="user-icon" v-else
			src='https://youzhen123.oss-cn-huhehaote.aliyuncs.com/WechatOwnerProperty/images/mrtx.png'
			mode="aspectFit"></image>

			<view class="name" v-if="currentInfo.id">
			<view class="t1">
			{{
			(!!currentInfo.supplierDTO ? (currentInfo.supplierDTO.name) : "") \|\| (!!currentInfo.customerDTO ? (currentInfo.customerDTO.name) : "") \|\| currentInfo.nickName \|\| currentInfo.loginName \|\| '-'
			}}<span v-if="currentInfo.supplierDTO&&currentInfo.supplierDTO.status!=='P'">
			({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span>
			</view>
			<view class="t2">{{ currentInfo.tel \|\| '暂无电话' }}</view>
			</view>
			<view class="name" v-if="!currentInfo.id" open-type="getUserInfo" @click.stop="toCustomerLogin"
			style="font-size: 48rpx;margin-top: 16rpx;">
			{{ '点击登陆' }}
			</view>
			<image class="icon-setting" src="../../static/common/icon-setting.png" mode="aspectFit"></image>
			</view>
			</view>

			<view class="user-utils m-20">
			<view class="user-util m-t-12 flex" @click="goto('/sub_pages/partner/delivery/delivery',true)">
			<view class="title">质检列表</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view>
			<view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)">
			<view class="title">修改密码</view>
			<view class="right-icon">
			<uni-icons type="right"></uni-icons>
			</view>
			</view>

			<view class="user-util m-t-12 " v-if="selftype==='supplier'\|\|selftype==='customer' \|\| !selftype">
			<view class="title">我的客服</view>
			<view class="flex">
			<image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
			<view class="name" @click="callTel">
			客服电话 :    <span class="topic-gray">{{ tel }}</span>
			</view>
			<view class="right-icon" open-type="contact">
			<uni-icons type="right"></uni-icons>
			</view>
			</view>
			</view>
			</view>


			<view class="button-login-out topic-gray" @click="clearlogout">
			退出登录
			</view>


			</view>
			</template>

			<script>
			export default {
			data() {
			return {
			CustomBar: uni.getStorageSync('CustomBar'),
			StatusBar: uni.getStorageSync('StatusBar'),
			tcode: '',
			inviterName: '',
			// StatusBar:0,
			tel: '15974805814',
			tj: {},
			cacheUserId: '',

			};
			},
			// watch: {
			// currentInfo(nv, ov) {
			// if (!cacheUserId) {

			// }
			// }
			// },
			onShow() {},
			onLoad(options) {
			// const url = options.q ? decodeURIComponent(options.q) : '';
			// const urlcode = options.url && decodeURIComponent(options.url) \|\| ''



			},
			created() {

			},
			async onPullDownRefresh() {
			await this.$store.dispatch('getCurrentInfo')
			uni.stopPullDownRefresh()
			},
			methods: {


			async clearlogout() {
			await this.$message.confirm('是否退出登录?')
			this.$store.commit('updateLogin', false)

			uni.reLaunch({
			url: '/pages/login/supplier-login'
			})
			},
			async callTel() {
			await this.$message.confirm('是否拨打客服电话')
			uni.makePhoneCall({
			phoneNumber: this.tel //仅为示例
			});
			},
			}
			}
			</script>

			<style lang="scss" scoped>
			@import "@/pages/user/user.scss";
			</style>

			<style lang="scss" scoped>
			</style>

			@@ -17,7 +17,7 @@
			}
			},
			onLoad() {
			this.listApi = '/api/delivery/list/today'
			this.listApi = '/api/delivery/list'
			this.getList()
			this.$http.request('get', '/api/station/list', {
			params: {}
			@@ -49,6 +49,9 @@
			uni.stopPullDownRefresh()
			},
			methods: {
			buttonSearchFlow() {
			this.refreshList()
			},
			select_station(e) {
			this.show_select_station = false
			this.query.stationName = e.value[0].name
			@@ -69,15 +72,19 @@
			async compelete(item) {
			await this.$message.confirm("是否完成此单质检")

			const {code, data} = this.$http.request('get', '/api/delivery/list/view/complete', {
			const {
			code,
			data
			} = this.$http.request('get', '/api/delivery/list/view/complete', {
			params: {
			id: item.id
			}
			})
			if (code === 0) {
			this.$message.showToast('完成成功')
			let tmp = this
			setTimeout(() => {
			this.refreshList()
			tmp.refreshList()
			}, 200)
			}
			}
			@@ -90,14 +97,14 @@
			<view class="p15" style="min-height: calc(100vh - 260rpx);">
			<view class="search-container m-t-12 flex">
			<view class="flex1 input">
			<u-input placeholder="请输入花名" v-model="search_flow">
			<u-input placeholder="请输入供应商名称" v-model="query.supplierName">
			<template slot="suffix">
			<uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
			</template>
			</u-input>
			</view>
			</view>
			<view class="component-filter-container">
			<view class="component-filter-container p20 bg-white">
			<view class="flex1" @click="show_select_status=true">
			配送单状态:{{ query.statusStr \|\| '全部' }}
			<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
			@@ -111,32 +118,39 @@

			<no-data v-if="!list\|\|list.length===0" style="width: 100%;"></no-data>
			<view v-for="(item,index) in list" :key="index" class="m-b-24">
			<view class="delivery-item">
			<view class="title">{{ item.supplierName }}</view>
			<view class="delivery-item bg-white br-4 p10">
			<view class="title">供应商：{{ item.supplierName }}</view>
			<view class="line-gray"></view>
			<view class="form-item">
			<view class="form-item-label">订单单号:</view>
			<view class="form-item-label">订单单号</view>
			<view class="form-item-value">{{ item.orderNo \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="form-item-label">集货站名称:</view>
			<view class="flex">
			<view class="form-item flex1">
			<view class="form-item-label">集货站</view>
			<view class="form-item-value">{{ item.stationName \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="form-item-label">配送单状态:</view>
			<view class="form-item-value">{{ item.levelStr \|\| '-' }}</view>

			</view>
			<view class="form-item">
			<view class="form-item-label">送达时间</view>
			<view class="form-item-value">{{ item.arriveTime \|\| '-' }}</view>
			<view class="flex">
			<view class="form-item flex1">
			<view class="form-item-label">状态</view>
			<view class="form-item-value">{{ item.statusStr \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="form-item flex1">
			<view class="form-item-label">供货总数</view>
			<view class="form-item-value">{{ item.totalNum \|\| '-' }}</view>
			</view>
			<view class="line-gray"></view>
			<view class="flex">
			<view class="button button-2 m-l-a m-r-0" @click="toDetail(item)">前往质检</view>
			</view>
			<view class="form-item flex1">
			<view class="form-item-label">送达时间</view>
			<view class="form-item-value">{{ item.arriveTime \|\| '-' }}</view>
			</view>


			<view class="line-gray" v-if="item.status==='ARRIVED'"></view>
			<view class="flex buttons" v-if="item.status==='ARRIVED'">
			<view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">前往质检</view>
			<view class="button button-1 m-l-15 m-r-0" @click="compelete(item)">质检完成</view>
			</view>
			</view>
			@@ -147,8 +161,8 @@
			<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
			<u-picker @confirm="select_station" keyName="name" @cancel="show_select_station=false"
			:show="show_select_station" :columns="columns_station"></u-picker>
			<u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false"
			:show="show_select_status" :columns="status_columns"></u-picker>
			<u-picker @confirm="select_status" keyName="name" @cancel="show_select_status=false" :show="show_select_status"
			:columns="status_columns"></u-picker>


			</view>
			@@ -158,21 +172,56 @@
			.page-delivery {
			.delivery-item {
			.title {
			font-weight: 400;
			font-size: 28rpx;
			font-weight: 600;
			font-size: 32rpx;
			color: #000000;
			line-height: 40rpx;
			}

			.form-item {
			line-height: 40rpx;
			font-size: 28rpx;
			color: #666;
			display: flex;

			.form-item-label {
			min-width: 120rpx;
			}

			.form-item-label::after {
			content: ":";
			margin-right: 20rpx;
			}
			}

			.buttons {
			display: flex;
			margin-left: auto;
			width: fit-content;

			.button {
			min-width: 122rpx;
			text-align: center;
			height: 48rpx;
			line-height: 48rpx;
			border-radius: 28rpx;
			border: 2rpx solid #20613D;
			// width: 216rpx;
			padding: 10rpx 20rpx;
			line-height: 34rpx;
			font-size: 24rpx;
			color: #20613D;
			height: 34rpx;
			background: #20613D;
			text-align: center;
			border-radius: 30rpx;

			}

			.button-1 {
			background: #fff;
			color: #333;
			border: 2rpx solid #333;

			}

			.button-0 {
			color: #fff;
			border: 2rpx solid #20613D;
			}
			}
			}

			@@ -203,5 +252,4 @@
			}
			}
			}

			</style>

			@@ -1,15 +1,18 @@
			<template>
			<view class="list-container markup-config">
			<view class="list-container markup-config p20">
			<view class="search-container m-t-12 flex">
			<view class="flex1 input">
			<u--input placeholder="请输入商品名称" v-model="query.name">
			</u--input>
			<u-input placeholder="请输入分类名称" v-model="query.name" clearable>
			<template slot="suffix">
			<uni-icons color="#20613D" type="search" size="24" @tap="refreshList"></uni-icons>
			</template>
			</u-input>
			</view>
			<view class="button" @click="refreshList">搜索</view>
			</view>
			<view class="m-t-12">

			<!-- <view class="m-t-12 text-center bg-white p10" @click="show_time_picker_time=true">
			{{ !query.time && '请选择时间' \|\| (query.time) }}
			</view>
			</view> -->


			<view class="p15" style="min-height: calc(100vh - 160rpx);">
			@@ -69,7 +72,7 @@
			<!-- 判断是否到底了，自动吧 -->
			<footer-msg :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
			<u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
			@confirm="select_time_picker_time" v-model="tmp_picker_time" mode="time"></u-datetime-picker>
			@confirm="select_time_picker_time" v-model="tmp_picker_time" mode="datetime"></u-datetime-picker>

			</view>
			</template>
			@@ -104,6 +107,7 @@
			},
			methods: {
			async select_time_picker_time(e) {
			console.log('select_time_picker_time', e)
			var vv = e.value
			if (vv) {
			vv = vv.replace('aN:', '00:')
			@@ -125,7 +129,8 @@
			.list-container.markup-config {
			.search-container {
			display: flex;
			margin: 24rpx 30rpx 20rpx 30rpx;
			// margin: 24rpx 30rpx 20rpx 30rpx;


			.input {
			// flex: 1;
			@@ -140,7 +145,7 @@
			max-width: 120rpx;
			margin-left: auto;
			margin-right: 0rpx;
			text-align: right;
			// text-align: right;
			line-height: 70rpx !important;
			// height: 58rpx !important;
			// display: flex;
			@@ -212,11 +217,9 @@
			max-width: 50%;
			flex: 1;

			.form-item-label {
			}
			.form-item-label {}

			.form-item-value {
			}
			.form-item-value {}
			}

			}

			@@ -72,7 +72,7 @@
			}
			},
			onLoad() {
			this.listApi = `/api/partner/list`
			this.listApi = `/api/partner/order/list`
			this.getList()

			},

对比新文件
			@@ -0,0 +1,404 @@
			<script>
			export default {
			data() {
			return {
			id: '',
			dto: {},
			type: '',
			// #ifdef PUB_CUSTOMER
			type: 'customer',
			// #endif
			// #ifdef PUB_PARTNER
			type: 'partner',
			// #endif
			};
			},
			async onLoad(options) {
			console.log('options', options)
			this.id = options.id \|\| ''
			if (this.id) {
			await this.getDetail()
			this.getItemList()
			}
			},
			methods: {

			async getDetail() {
			this.$message.showLoading()
			const {
			code,
			data
			} = await this.$http.request('get', `/api/${this.type}/sales/list/view`, {
			params: {
			id: this.id
			}
			})
			this.$message.hideLoading()
			console.log('getDetail', data)
			if (code === 0) {
			this.dto = {
			...this.dto,
			...data,
			items: data.items \|\| []
			}
			}
			},


			},
			}
			</script>

			<template>
			<view class="order-detail-page">
			<view class="address-container bg-white br-4 m-t-12">
			<view class="flex">
			<image src="/static/common/icon-loc.png" class="image m-r-10"></image>

			<!-- <view class="icon-loc m-r-10">
			<image src="/static/common/icon-loc.png" class="image"></image>
			</view> -->
			<view class="info">
			<view class="title">
			{{ dto.customer }}
			<view class="tel">{{ dto.customerTel }}</view>
			</view>
			<view class="content">{{ dto.customerAddress }}</view>
			</view>
			</view>
			</view>
			<view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of dto.items" :key="index">
			<view class="supplier-name ">
			<image class="icon-dp" src="/static/common/icon-dp.png"></image>
			{{ item.supplierName }}
			</view>
			<view class="flex m-t-12">
			<image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
			</image>
			<view class="flex1">
			<view class=" flex">
			<view class="title"><span class="level">{{ item.flowerCategory }}</span><span
			class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }}
			</view>
			</view>
			<view class="each-list">
			<view class="each-item">
			<view class="label">颜色</view>
			<view class="value">{{ item.flowerColor \|\| '-' }}</view>

			</view>
			<view class="each-item">
			<view class="label">规格</view>
			<view class="value">{{ item.flowerUnit \|\| '-' }}</view>
			</view>

			<view class="each-item">
			<view class="label">数量</view>
			<view class="value">{{ item.num \|\| 0 }}</view>

			</view>
			<view class="each-item">
			<view class="label">售价</view>
			<view class="value">￥{{ item.price \|\| 0 }}</view>

			</view>
			<view class="each-item">
			<view class="label">商品总金额</view>
			<view class="value">￥{{ item.total \|\| 0 }}</view>

			</view>
			<view class="each-item">
			<view class="label">责任方</view>
			<view class="value">{{ item.personInChargeStr \|\| '-' }}</view>
			</view>
			<view class="each-item">
			<view class="label">备注</view>
			<view class="value">{{ item.remarks \|\| '-' }}</view>
			</view>
			<view class="each-item">
			<view class="label">赔付金额</view>
			<view class="value t-red">￥{{ item.amount \|\| '-' }}</view>
			</view>
			</view>
			</view>
			</view>

			</view>

			<view class="info-container bg-white br-4">
			<view class="form-item">
			<view class="label">订单编号:</view>
			<view class="value">{{ dto.orderNo \|\| '-' }}</view>
			<view class="button m-l-a m-r-0" @click="copyTxt(dto.orderNo)">复制
			</view>
			</view>
			<view class="form-item">
			<view class="label">状态:</view>
			<view class="value">{{ dto.statusStr \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">订单金额:</view>
			<view class="value">{{ dto.totalOrderAmount \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">理由:</view>
			<view class="value">{{ dto.reason \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">提交人:</view>
			<view class="value">{{ dto.createName \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">提交时间:</view>
			<view class="value">{{ dto.createTime \|\| '-' }}</view>
			</view>
			</view>

			<view class="info-container bg-white br-4">

			<view class="form-item">
			<view class="label">售后单号:</view>
			<view class="value">{{ dto.salesNo \|\| '-' }}</view>
			<view class="button m-l-a m-r-0" @click="copyTxt(dto.salesNo)">复制
			</view>
			</view>

			<view class="form-item">
			<view class="label">审核时间:</view>
			<view class="value">{{ dto.auditTime \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">审核状态:</view>
			<view class="value">{{ dto.auditStatusStr \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">审核备注:</view>
			<view class="value">{{ dto.auditRemarks \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">总赔付金额:</view>
			<view class="value">{{ dto.totalAmount \|\| '-' }}</view>
			</view>
			<view class="form-item">
			<view class="label">转账状态:</view>
			<view class="value">{{ dto.transferStatusStr \|\| '-' }}</view>
			</view>

			</view>



			</view>
			</template>

			<style lang="scss" scoped>
			.order-detail-page {
			background: #F7F7F7;
			padding: 30rpx;

			.info-container {
			.button-space {
			min-height: 140rpx;
			}

			.icon-kf {
			width: 44rpx;
			height: 44rpx;
			}

			.icon-call {
			width: 32rpx;
			height: 32rpx;
			}

			.icon-view {
			line-height: 40rpx;

			.icon {
			display: inline-block;
			vertical-align: middle;
			}
			}

			.buttons-bottom {
			position: fixed;
			left: 0;
			bottom: 0;
			right: 0;
			height: 120rpx;

			.button {
			border-radius: 42rpx;
			border: 2rpx solid #CECECE;
			font-weight: 400;
			font-size: 28rpx;
			color: #999999;
			text-align: center;
			line-height: 76rpx;
			}

			.button-1 {}
			}
			}

			.info-container {
			padding: 28rpx;

			.form-item {
			font-weight: 400;
			font-size: 28rpx;
			color: #666666;
			line-height: 60rpx;
			display: flex;

			.label {
			min-width: 140rpx;
			margin-right: 20rpx;
			}

			.value {
			word-break: break-all;
			}
			}

			.line {
			height: 2rpx solid #EEEEEE;
			}
			}

			.top-tip {
			.icon-car {
			width: 52rpx;
			height: 52rpx;
			}
			}

			.address-container {
			padding: 28rpx;
			.image {
			// background-color: #20613D;
			border-radius: 50%;
			margin-top: 8rpx;
			margin-left: 8rpx;
			width: 32rpx;
			height: 32rpx;
			// padding: 8rpx;
			}
			// .icon-loc {
			// width: 48rpx;
			// height: 48rpx;
			// background: #20613D;
			// border-radius: 50%;

			// .image {
			// margin-top: 8rpx;
			// margin-left: 8rpx;
			// width: 32rpx;
			// height: 32rpx;
			// }
			// }

			.info {
			.title {
			font-weight: 600;
			font-size: 32rpx;
			color: #000000;
			line-height: 44rpx;

			.tel {
			display: inline-block;
			margin-left: 20rpx;
			}
			}

			.content {
			font-weight: 400;
			font-size: 28rpx;
			color: #000000;
			line-height: 40rpx;
			}

			}
			}

			.flower-info {
			padding: 28rpx;

			background: #FFFFFF;
			border-radius: 8rpx;

			.supplier-name {
			border-bottom: 2rpx solid #EEEEEE;
			font-weight: 600;
			font-size: 28rpx;
			color: #000000;
			padding-bottom: 10rpx;
			line-height: 40rpx;

			.icon-dp {
			width: 27rpx;
			height: 27rpx;
			display: inline-block;
			vertical-align: middle;
			}
			}

			.title {
			font-weight: 600;
			font-size: 28rpx;
			color: #000000;
			line-height: 40rpx;

			.level {
			font-weight: 400;
			font-size: 28rpx;
			color: #20613D;
			line-height: 40rpx;
			margin-right: 20rpx;
			}
			}

			.flower-img {
			width: 128rpx;
			height: 118rpx;
			min-width: 128rpx;
			min-height: 118rpx;
			}

			.each-list {
			display: flex;
			flex-wrap: wrap;
			margin-top: 6rpx;

			.each-item {
			min-width: 30%;
			max-width: 40%;
			text-align: center;
			margin-left: 0rpx;
			margin-right: auto;
			display: flex;

			.label {
			font-weight: 400;
			font-size: 24rpx;
			color: #666666;
			text-align: left;
			padding-right: 10rpx;
			}

			.label::after {
			content: ": "
			}

			.value {
			font-weight: 400;
			font-size: 24rpx;
			color: #666666;
			}
			}
			}

			}

			}
			</style>

			@@ -6,7 +6,8 @@
			</view> -->
			<view class="p15" style="min-height: calc(100vh - 160rpx);">
			<no-data v-if="!list\|\|list.length==0" style="width: 100%;"></no-data>
			<view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container">
			<view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
			class="m-b-24 order-sale-list list-container">
			<view class="order-sale-item br-4 list-item bg-white">
			<view class="title flex">
			<view>售后单号:{{item.salesNo}}</view>
			@@ -91,9 +92,9 @@
			}
			},
			toDetail(item) {
			// uni.navigateTo({
			// url: `/pages/notice/notice?id=${item.id}`
			// })
			uni.navigateTo({
			url: `/sub_pages/supplier/order-sale/order-sale-detail?id=${item.id}`
			})
			}
			}
			}

对比新文件
			@@ -0,0 +1,225 @@
			<template>
			<view class="list-container order-sale supplier p20">
			<view class="m-b-24 order-sale-list list-container">
			<view class="order-sale-item br-4 m-t-12 list-item bg-white">
			<view class="title flex">
			<view class="title">
			<image src="/static/common/icon-date.png" class="icon-date m-r-10 image"></image>
			转账日期:{{dto.createTime}}
			</view>
			</view>
			<view class="line"></view>
			<view class="form">
			<view class="flex">
			<view class="form-item flex1">
			<view class="label">结算单价/均价</view>
			<view class="value">￥{{dto.price\|\|'0.00'}}</view>
			</view>
			<view class="form-item flex1">
			<view class="label">商品数量</view>
			<view class="value">{{dto.flowerNum\|\|0}}</view>
			</view>
			</view>
			<view class="flex">
			<view class="form-item">
			<view class="label">订单数量</view>
			<view class="value">{{dto.orderNum}}</view>
			</view>
			<view class="form-item">
			<view class="label">买家数量</view>
			<view class="value">{{dto.customerNum}}</view>
			</view>
			</view>
			<view class="flex">
			<view class="form-item">
			<view class="label">服务费</view>
			<view class="value">{{dto.serviceFee}}</view>
			</view>
			<view class="form-item">
			<view class="label">售后理赔</view>
			<view class="value">{{dto.salesFee}}</view>
			</view>
			</view>
			<view class="flex">
			<view class="form-item">
			<view class="label">质检扣款</view>
			<view class="value">{{dto.checkFee}}</view>
			</view>
			<view class="form-item">
			<view class="label">集货站运费</view>
			<view class="value">{{dto.stationFee}}</view>
			</view>
			</view>
			</view>

			<view class="line"></view>
			<view class="form">
			<view class="flex">
			<view class="form-item">
			<view class="label title-bold">交易合计</view>
			<view class="value t-red">￥{{dto.totalAmount\|\|0}}</view>
			</view>
			<view class="form-item">
			<view class="label title-bold">结算金额</view>
			<view class="value t-red">￥{{dto.settlementAmount\|\|0}}</view>
			</view>
			</view>
			</view>
			</view>
			</view>

			<view class="m-b-24 order-sale-list list-container">
			<view class="order-sale-item br-4 m-t-12 list-item bg-white">
			<view class="title flex">
			结算商品明细
			</view>
			<view v-for="(item,index) of dto.details" :key="index" class="p10">
			<view class="line"></view>
			<view class="form">
			<view class="form-item flex">
			<view class="label">商品名称</view>
			<view class="value">{{item.flowerName\|\|'-'}}</view>
			</view>
			<view class="flex">
			<view class="form-item flex1">
			<view class="label">结算单价</view>
			<view class="value">￥{{item.price\|\|'0.00'}}</view>
			</view>
			<view class="form-item flex1">
			<view class="label">商品数量</view>
			<view class="value">{{item.num\|\|0}}</view>
			</view>
			</view>
			<view class="flex">
			<view class="form-item">
			<view class="label">结算合计</view>
			<view class="value">￥{{item.totalAmount\|\|0}}</view>
			</view>
			<view class="form-item">
			<view class="label">质检扣款</view>
			<view class="value">￥{{item.checkFee\|\|'0.00'}}</view>
			</view>
			</view>
			<view class="flex">
			<view class="form-item">
			<view class="label">集货站运费</view>
			<view class="value">￥{{item.stationFee\|\|'0.00'}}</view>
			</view>
			<view class="form-item">
			<view class="label">售后理赔</view>
			<view class="value">￥{{item.salesFee\|\|'0.00'}}</view>
			</view>
			</view>
			</view>

			</view>

			</view>
			</view>
			</view>
			</template>

			<script>
			export default {
			data() {
			return {
			id: '',
			dto: {

			}
			}
			},
			onLoad(options) {
			this.id = options.id \|\| ''
			if (this.id)
			this.getList()

			},

			methods: {
			async getDetail() {
			this.$message.showLoading()
			const {
			code,
			data
			} = await this.$http.request('get', '/api/partner/settlement/list/view?id=' + this.id, {

			})

			this.$message.hideLoading()
			if (code == 0) {
			this.dto = {
			...data,
			details:data.details\|\|[]
			}
			}


			}
			}
			}
			</script>

			<style lang="scss" scope>
			.order-sale-list {
			.order-sale-item {
			margin-bottom: 20rpx;
			padding: 22rpx;

			.title {
			font-weight: 600;
			font-size: 28rpx;
			color: #000000;
			line-height: 40rpx;
			}

			.line {
			min-height: 2rpx;
			background-color: #EEEEEE;
			margin-top: 16rpx;
			margin-bottom: 16rpx;
			}

			.form {
			display: flex;
			flex-wrap: wrap;

			.form-item {
			flex: 1;
			// min-width: 40%;
			// max-width: 50%;

			.label {
			font-weight: 400;
			font-size: 24rpx;
			color: #666666;
			line-height: 34rpx;
			}

			.label::after {
			content: ":";
			font-weight: 400;
			font-size: 24rpx;
			color: #666666;
			line-height: 34rpx;
			}

			.value {
			font-weight: 400;
			font-size: 24rpx;
			color: #000000;
			line-height: 34rpx;
			}

			.value.red {
			color: #CF0000;
			}
			}

			.form-item.width100 {
			max-width: unset;
			}
			}
			}
			}
			</style>