update需求更新

xuxueyang

2024-07-22 32ab1af0797e3e8ab60dc646fc2c30cddf1dfa1f

update需求更新

 App.vue

@@ -49,22 +49,7 @@
                url: '/pages/home/home'

            })

            // #endif



            // // #ifdef H5

            // if (true && storage.getItem('token')) {

            //     setTimeout(async () => {

            //         const res = await this.$store.dispatch('getCurrentInfo');

            //         // console.log('init info',res,this.currentInfo)

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

            //             // uni.reLaunch({

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

            //             // })

            //         }

            //     }, 200);

            // } else {



            // }

            // // #endif

 
        },



        onReady() {


 common/global.scss

@@ -84,7 +84,7 @@
    position: relative;
    .button-space{
        // border: 2rpx solid #EEEEEE;
        min-height: 124rpx;
        min-height: 140rpx;
    }
    .value-items{
        
@@ -117,8 +117,8 @@

    .button-green{
        border-top: 2rpx solid #EEEEEE;
        position: absolute;
        bottom: 26rpx;
        position: fixed;
        bottom: 80rpx;
        left: 26rpx;
        right: 26rpx;
        height: 78rpx;
@@ -279,3 +279,10 @@




}



.u-steps-item{
    /deep/ .u-text__value{
        font-size: 28rpx !important;
    }
}

 components/animation-words.vue

文件已删除

 components/dying318-picker/Demo.vue

文件已删除

 components/dying318-picker/Picker.nvue

文件已删除

 components/dying318-picker/Picker.vue

文件已删除

 components/dying318-picker/README.md

文件已删除

 environments/index.js

@@ -1,7 +1,7 @@
export default {
    
    httpBaseUri: 'https://www.hmyxianhua.com/flower',
    // httpBaseUri: 'http://47.99.58.211/flower',
    // httpBaseUri: 'https://www.hmyxianhua.com/flower',
    httpBaseUri: 'http://47.99.58.211/flower',

    clientId: '',
    secret: '',

 main.js

@@ -40,6 +40,10 @@
        },
        picker:{
            confirmColor:'#20613D'
        },
        steps:{
            size:32,
            fontSize:32
        }
        // 其他组件属性配置
        // ......
@@ -67,12 +71,13 @@
Vue.component('footer-msg', footerMsg)



// #ifdef PUB_CUSTOMER
import selectItems from '@/components/common-select-items'
Vue.component('common-select-items', selectItems)

import addressSelect from '@/components/common-address-select/common-address-select'
Vue.component('common-address-select', addressSelect)
// #endif

import topTabs from '@/components/top-tabs.vue'
Vue.component('top-tabs', topTabs)

 manifest.json

@@ -49,7 +49,7 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wx6d0ecc4e18710458",
        "appid" : "wx3203fd935a6ffe09",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,

 pages.json

@@ -29,14 +29,30 @@
            }



        },

        {

            "path": "pages/user/address/address",

            "style": {

                "navigationBarTitleText": "收货地址",

                "enablePullDownRefresh": false

            }

        },

        // #endif 



        // #ifndef PUB_CUSTOMER

        // #ifdef PUB_SUPPLIER

        {

            "path": "pages/login/supplier-reg",

            "style": {

                "navigationBarTitleText": "申请入驻",

                "navigationStyle": "custom"

            }

        },

        // #endif 


        // #ifdef PUB_PARTNER

        {

            "path": "pages/login/supplier-reg",

            "style": {

                "navigationBarTitleText": "申请入驻"

            }

        },

        // #endif 

@@ -75,42 +91,36 @@
                "navigationBarTitleText": "修改密码",

                "enablePullDownRefresh": false

            }

        },

        {

            "path": "pages/user/address/address",

            "style": {

                "navigationBarTitleText": "收货地址",

                "enablePullDownRefresh": false

            }

        }



    ],



    "subPackages": [{

        "root": "sub_pages/supplier",

        "pages": [
            // #ifdef PUB__SUPPLIER
        "pages": [

            // #ifdef PUB_SUPPLIER

            {

                "path": "supplier-info/supplier-info",

                "style": {

                    "navigationBarTitleText": "信息维护",

                    "enablePullDownRefresh": false

                }

            }, 
            {
                "path": "flower-manage/flower-manage",
                "style": {
                    "navigationBarTitleText": "商品管理",
                    "enablePullDownRefresh": true
                }
            },
            {
                "path": "flower-manage/flower-add",
                "style": {
                    "navigationBarTitleText": "",
                    "enablePullDownRefresh": false
                }
            },	
            // #endif
            },

            {

                "path": "flower-manage/flower-manage",

                "style": {

                    "navigationBarTitleText": "商品管理",

                    "enablePullDownRefresh": true

                }

            },

            {

                "path": "flower-manage/flower-add",

                "style": {

                    "navigationBarTitleText": "",

                    "enablePullDownRefresh": false

                }

            },

            // #endif

            {

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

                "style": {

@@ -118,7 +128,7 @@
                    "enablePullDownRefresh": true

                }

            },

			


            {

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

                "style": {

@@ -135,7 +145,7 @@


                }

            },

			


            {

                "path": "protocol",

                "style": {

@@ -148,16 +158,16 @@


    }, {

        "root": "sub_pages/partner",

        "pages": [
            // #ifdef PUB_PARTNER
            {
                "path": "partner-info/partner-info",
                "style": {
                    "navigationBarTitleText": "信息维护",
                    "enablePullDownRefresh": false
                }
            },		
            // #endif 
        "pages": [

            // #ifdef PUB_PARTNER

            {

                "path": "partner-info/partner-info",

                "style": {

                    "navigationBarTitleText": "信息维护",

                    "enablePullDownRefresh": false

                }

            },



            {

                "path": "order-manage/order-manage",

                "style": {

@@ -172,11 +182,15 @@
                    "enablePullDownRefresh": true

                }

            }



            // #endif

        ]

    }, {

        "root": "sub_pages/customer",

        "pages": [{

        "pages": [

            // #ifdef PUB_CUSTOMER 




            {

                "path": "trade/trade",

                "style": {

                    "navigationBarTitleText": "交易大厅",

@@ -211,7 +225,7 @@
                    "navigationBarTitleText": "商家主页"

                }

            }



            // #endif 
        ]

    }],

    "globalStyle": {


 pages/home/supplier-home.vue

@@ -281,6 +281,7 @@

                    }
                }
                console.log('goto')
                this.goto('/sub_pages/supplier/flower-manage/flower-manage', true)
            },
            getNoticeMore() {

 pages/login/supplier-login.vue

@@ -175,7 +175,7 @@
                var addstr = ''

                // #ifdef PUB_PARTNER

                addstr = '?source=step'
                uni.redirectTo({
                uni.navigateTo({
                    url: '/sub_pages/partner/partner-info/partner-info' + addstr
                })

                // #endif

 pages/login/supplier-reg.vue

@@ -1,73 +1,85 @@
<template>
    <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
        <image class="component-bg"
            src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png"
            mode="scaleToFill" />
			
        <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;">
            <view style="padding: 20rpx;text-align: center;background-color: #fff;">先阶段仅限云南产地的供应商入住</view>
    <view>
        <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;">
            <view style="padding: 20rpx;text-align: center;background-color: #fff;">现阶段仅限云南产地的供应商入住</view>
            <view v-if="source==='step'" class="" style="background-color: #fff;margin-top: 20rpx;padding: 20rpx;">
                <u-steps current="1">
                    <u-steps-item title="信息填写" class="u-steps-item">
                    </u-steps-item>
                    <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item>
                </u-steps>
            </view>
        </view>
        <view v-if="source==='step'" >
            <u-steps current="0">
                <u-steps-item title="信息填写">
                </u-steps-item>
                <u-steps-item title="提交申请"  ></u-steps-item>
            </u-steps>
        </view>
		

        <view class="t-login top-bg">
            <view class="nav-title">注册</view>
            <view class="login">
                <form class="cl">
                    <view class="t-a titles-top">
                        <view class="title-1">HELLO</view>
                        <view class="title-2">欢迎入驻<span class="title-3">花满芜</span></view>
        <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
            <image class="component-bg"
                src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png"
                mode="scaleToFill" />


            <view class="t-login top-bg">

                <view class="nav-title" v-if="source!=='step'" :style="{'padding-top':source==='step'?'60rpx':'unset'
                ,'padding-bottom':source==='step'?'80rpx':'unset'}">

                    <view>
                        注册
                    </view>
                </view>
                <view class="login" style="padding-top: 40rpx;">
                    <form class="cl">
                        <view class="t-a titles-top">
                            <view class="title-1">HELLO</view>
                            <view class="title-2">欢迎入驻<span class="title-3">花满芜</span></view>
                        </view>


                    <view class="t-a form-input" v-if="loginType=='code'">
                        <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
                            <template slot="suffix">
                                <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
                                    {{getCodeText}}
                                </view>
                            </template>
                        </u-input>
                        <view class="t-a form-input" v-if="loginType=='code'">
                            <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
                                <template slot="suffix">
                                    <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
                                        {{getCodeText}}
                                    </view>
                                </template>
                            </u-input>

                        <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber"
                            <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber"
                            style="position: relative;z-index: 1;" /> -->


                    </view>
                        </view>


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

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

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

                    <button @tap="login()" class="bottom-button">注 册</button>

                    <view class="flex">
                        <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
                    </view>
                    <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;"
                        v-if="false">
                        <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
                            @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
                            <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>

                        </view>
                        <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芜合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序
                        <view class="t-a form-input" v-if="loginType=='code'">
                            <!-- <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>
                </form>

                        <button @tap="login()" class="bottom-button">注 册</button>

                        <view class="flex">
                            <view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回填写</view>
                            <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
                        </view>
                        <view class="flex flex-wrap-normal"
                            style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false">
                            <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
                                @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">

                            </view>
                            <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芜合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序
                            </view>
                        </view>
                    </form>
                </view>
            </view>
        </view>
    </view>
@@ -109,6 +121,10 @@
            this.source = options.source || ''
        },
        methods: {
            backInfoPage(){
                console.log('backInfoPage')
                uni.navigateBack()
            },
            toProtocol() {
                uni.navigateTo({
                    url: '/sub_pages/supplier/protocol'
@@ -227,6 +243,17 @@
                    type: this.apitype
                    // openId: '123456789'
                }
                if (this.source == 'step') {
                    var tjson = this.$storage.getItem('cache_partner_info')

                    if (!tjson) {
                        this.$message.showToast('没有合伙人信息请返回重新填写')
                        return
                    }
                    var dto = JSON.parse(tjson)
                    post.dto = dto
                }

                // const {
                // code
                // } = await this.$http.request('get', '/api/login/admin')
@@ -244,41 +271,46 @@
                        title: '注册成功！',
                        icon: 'none'
                    });
                    if (this.source == 'step') {
                        // cache_partner_info
                        var tjson = this.$storage.getItem('cache_partner_info')
                        if (tjson) {
                            var dto = JSON.parse(tjson)
                            {
								
                                this.$message.showLoading()
                                const re = await this.$http.request('post', '/api/partner/addOrUpdate', {
                                    data: dto
                                })
                                this.$message.hideLoading()
                                if (re.code == 2000 || re.code == 0) {
                                    this.toLogin()
                                } else {
                                    this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
                                    setTimeout(() => {
                                            this.toLogin()
                                        }, 1000);
                                    }
                                }
                            }
							
                        }else{
                            this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
                            setTimeout(() => {
                                this.toLogin()
                            }, 1000);
                        }
                    setTimeout(() => {
                        this.toLogin()
                    }, 1000);
                    // if (this.source == 'step') {
                    //     // cache_partner_info
                    //     var tjson = this.$storage.getItem('cache_partner_info')
                    //     if (tjson) {
                    //         var dto = JSON.parse(tjson)

                    } else {
                        setTimeout(() => {
                            this.toLogin()
                        }, 1000);
                    }

                    //         this.$message.showLoading()
                    //         const re = await this.$http.request('post', '/api/partner/addOrUpdate', {
                    //             data: dto
                    //         })
                    //         this.$message.hideLoading()
                    //         if (re.code == 2000 || re.code == 0) {
                    //             this.$storage.removeItem('cache_partner_info')

                    //             this.toLogin()
                    //         } else {
                    //             this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
                    //             setTimeout(() => {
                    //                 this.toLogin()
                    //             }, 1000);
                    //         }



                    //     } else {
                    //         this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
                    //         setTimeout(() => {
                    //             this.toLogin()
                    //         }, 1000);
                    //     }

                    // } else {
                    //     setTimeout(() => {
                    //         this.toLogin()
                    //     }, 1000);
                    // }


                } else {
@@ -286,7 +318,7 @@
                    //     title: '登录失败！',
                    //     icon: 'none'
                    // });
                    return;
                    return
                }

            },

 static/imgs/home/home-shop-top-icon.png

Binary files differ

 store/index.js

@@ -84,14 +84,8 @@
                    setColorIndex(state, index) {
                        state.colorIndex = index
                    },
                    setMatchLeftWindow(state, matchLeftWindow) {
                        state.noMatchLeftWindow = !matchLeftWindow
                    },
                    setActive(state, tabPage) {
                        state.active = tabPage
                    },
                    setLeftWinActive(state, leftWinActive) {
                        state.leftWinActive = leftWinActive
                    },
                    setActiveOpen(state, activeOpen) {
                        state.activeOpen = activeOpen
@@ -161,29 +155,6 @@
                                    }
                                })
                            }
                        })
                    },
                    getPhoneNumber: function({
                        commit
                    }, univerifyInfo) {
                        return new Promise((resolve, reject) => {
                            uni.request({
                                url: 'https://97fca9f2-41f6-449f-a35e-3f135d4c3875.bspapp.com/http/univerify-login',
                                method: 'POST',
                                data: univerifyInfo,
                                success: (res) => {
                                    const data = res.data
                                    if (data.success) {
                                        resolve(data.phoneNumber)
                                    } else {
                                        reject(res)
                                    }

                                },
                                fail: (err) => {
                                    reject(res)
                                }
                            })
                        })
                    },
                    getCurrentInfo: async function({
@@ -258,7 +229,8 @@
                                    username: data.username,
                                    password: data.password,
                                    tel: data.phoneNumber || data.tel,
                                    smsCode: data.smsCode || ''
                                    smsCode: data.smsCode || '',
                                    dto: data.dto || undefined
                                },
                                params: {
                                    clientType: data.clientType || 'app'

 sub_pages/partner/partner-info/partner-info.vue

@@ -1,16 +1,16 @@
<template>
    <view class="container-page">
        <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;">
            <view style="padding: 20rpx;text-align: center;background-color: #fff;">先阶段仅限云南产地的供应商入住</view>
    <view class="container-page" style="padding: 0rpx;">
        <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;">
            <view style="padding: 20rpx;text-align: center;background-color: #fff;">现阶段仅限云南产地的供应商入住</view>
        </view>
        <view v-if="source==='step'" >
            <u-steps current="1">
                <u-steps-item title="信息填写">
        <view v-if="source==='step'" class="m-t-20">
            <u-steps current="0">
                <u-steps-item title="信息填写" class="u-steps-item" style="font-size: 28rpx;">
                </u-steps-item>
                <u-steps-item title="提交申请"  ></u-steps-item>
                <u-steps-item title="提交申请"   class="u-steps-item"></u-steps-item>
            </u-steps>
        </view>
        <view>
        <view class="p20">
            <view class="form-item before-line">
                <view class="label required">联系人姓名</view>
                <view class="m-l-a m-r-0 flex">
@@ -27,17 +27,17 @@

                </view>
            </view>

            <view class="form-item before-line">
                <view class="label required">集货站</view>
                <view class="m-l-a m-r-0 flex " :class="[!dto.stationId?'desc-gray':'']" @click="()=>{
                    if(!id){
                        show_select_station=true
                    }
                }">
                    <view>{{dto.stationName || '请选择'}}</view>
                    <u-icon class="m-l-a" name="arrow-right"></u-icon>
                <view class="label required">城市仓名称</view>
                <view class="m-l-a m-r-0 flex">
                    <input v-model="dto.cityWarehouse" placeholder="请输入城市仓名称"
                        style="margin-top: 16px;text-align: right;"></input>
			
                </view>
            </view>
			
			
            <view class="form-item before-line">
                <view class="label required">地区</view>

@@ -119,8 +119,8 @@
                    idCards: [],
                    address: '',
                    id: '',
                    stationId: '',
                    stationName: '',
                    // stationId: '',
                    // stationName: '',
                    userId: '',
                    name: '',
                    contactTel: '',
@@ -139,8 +139,8 @@
                        key: 'contactTel'
                    },
                    {
                        name: '集货站',
                        key: 'stationId'
                        name: '城市仓名称',
                        key: 'cityWarehouse'
                    },
                    {
                        name: '地区',
@@ -158,12 +158,12 @@
        },
        onLoad(options) {
            this.source = options.source || ''
            this.$http.request('get', '/api/station/list', {
                params: {}
            }).then(res => {
                var data = res.data
                this.columns_station = [data || []]
            })
            // this.$http.request('get', '/api/station/list', {
            //     params: {}
            // }).then(res => {
            //     var data = res.data
            //     this.columns_station = [data || []]
            // })
            if (options.id) {
                this.id = options.id
                this.getDetail()
@@ -309,7 +309,7 @@
                        ...this.dto
                    }))

                    uni.redirectTo({
                    uni.navigateTo({
                        url: '/pages/login/supplier-reg?source=step'
                    })


 sub_pages/supplier/flower-manage/flower-add.vue

@@ -126,7 +126,8 @@


            <view class="form-item ">

                <view class="label required">商品参数详情</view>

                <view class="m-l-a m-r-0 flex " :class="[!dto.applicationType?'desc-gray':'']" @click="()=>{

                <view class="m-l-a m-r-0 flex " style="flex-wrap: nowrap;"

                    :class="[!dto.applicationType?'desc-gray':'']" @click="()=>{

                    if(!dto.category){

                        $message.showToast('请先选择分类')

                    }else{

@@ -159,17 +160,21 @@
            <view v-if="dto.video">

                <video :src="dto.video" style="display: block;margin: 0 auto;"></video>

            </view>

            <view class="form-item ">

                <view class="label required">商品描述</view>

            <view class="form-item bottom-border-no">

                <view class="label">商品描述</view>

                <view class="m-l-a m-r-0 flex">

                    <!--     <u-input type="textarea" v-model="dto.description" placeholder="请输入商品描述" type="number"

                        ></u-input> -->

                    <u--textarea v-model="dto.description" style="margin-top: 16px;text-align: right;"

                        placeholder="请输入商品描述"></u--textarea>

                    <!--                     <u--textarea v-model="dto.description" style="margin-top: 16px;"

                        placeholder="请输入商品描述" count></u--textarea> -->

                    <!-- <uni-easyinput  v-model="dto.description" placeholder="请输入商品描述" ></uni-easyinput> -->



                </view>

            </view>



            <view style="min-width: 500rpx;margin-left: 20rpx;margin-right: 20rpx;margin-top: 20rpx;">

                <u--textarea v-model="dto.description" autoHeight

                    placeholder="请输入商品描述"></u--textarea>

            </view>





            <view style="min-height: 200rpx;">

@@ -214,7 +219,7 @@


<script>

    import environments from '@/environments'

    import dying318picker from '@/components/dying318-picker/Picker.vue'

    // import dying318picker from '@/components/dying318-picker/Picker.vue'

    import treeFilter from '@/components/tree-filter/tree-filter.vue'





@@ -431,7 +436,7 @@
                        }



                        if (has) {

                            console.log('has ', tmp, hasTrue, has)

                            // console.log('has ', tmp, hasTrue, has)

                            node.push(tmp)

                        } else {



@@ -708,7 +713,7 @@
            }

        },

        components: {

            dying318picker,

            // dying318picker,

            treeFilter

        }

    }