Merge remote-tracking branch 'remotes/origin/developer' into developerA

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.woff2?t=1680766548825') format('woff2'),
-       url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.woff?t=1680766548825') format('woff'),
-       url('//at.alicdn.com/t/c/font_1519039_dfhum6nnq6r.ttf?t=1680766548825') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff2?t=1701152770177') format('woff2'),
+       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.woff?t=1701152770177') format('woff'),
+       url('//at.alicdn.com/t/c/font_1519039_8mswuaopql9.ttf?t=1701152770177') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-youjiantou:before {
+  content: "\e603";
+}
+
 .icon-yixuanze3:before {
   content: "\e6d1";
 }

pages.json

@@ -208,6 +208,12 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "register-invite-club",
+					"style": {
+						"navigationBarTitleText": "邀请机构注册"
+					}
+				},
 				{
 					"path": "register-select",
 					"style": {
@@ -746,6 +752,12 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "club/club-inactive-list",
+					"style": {
+						"navigationBarTitleText": "不活跃机构"
+					}
+				},
 				{
 					"path": "club/club-visit-detail",
 					"style": { 
@@ -833,6 +845,12 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "login/register-invite",
+					"style": {
+						"navigationBarTitleText": "邀请机构注册"
+					}
+				},
 				{
 					"path": "order/order-historylist",
 					"style": {

pages/h5/activity/activity-topic.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="container floor clearfix" :style="{backgroundColor:pageInfo.backgroundColour ? pageInfo.backgroundColour : '#f7f7f7',backgroundImage:'url('+pageInfo.backgroundImage+')'}">
+    <view class="container floor clearfix" :style="{backgroundColor:(pageInfo.backgroundColour && pageInfo.backgroundType == 1) ? pageInfo.backgroundColour : '#f7f7f7',backgroundImage:'url('+pageInfo.backgroundImage+')'}">
         <!-- top -->
         <view
             class="container-top"

pages/h5/activity/quick-operation.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="floor clearfix" :style="{backgroundColor:pageInfo.backgroundColour ? pageInfo.backgroundColour : '#f7f7f7',backgroundImage:'url('+pageInfo.backgroundImage+')'}">
+	<view class="floor clearfix" :style="{backgroundColor:(pageInfo.backgroundColour && pageInfo.backgroundType == 1) ? pageInfo.backgroundColour : '#f7f7f7',backgroundImage:'url('+pageInfo.backgroundImage+')'}">
 		<!-- top -->
 		<view class="container-top" @click="BannerNavigateTo(pageInfo.linkType,pageInfo.linkParam.id,pageInfo.headLink,pageInfo.keyword)" v-if="isRequest && headImage!==''"><image :src="headImage" ></image></view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>

pages/login/register-invite-club.vue

@@ -0,0 +1,873 @@
+<template>
+    <view class="container register">
+        <view class="register-main clearfix">
+            <view class="register-logo">
+                <image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">联系人:</view>
+                    <input
+                        class="row-input"
+                        type="text"
+                        name="input"
+                        v-model="params.userName"
+                        placeholder="请输入机构联系人姓名"
+                        maxlength="6"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">手机号:</view>
+                    <input
+                        class="row-input"
+                        type="number"
+                        name="input"
+                        v-model="params.bindMobile"
+                        placeholder="请输入联系人常用手机号"
+                        maxlength="11"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">短信验证码:</view>
+                    <input
+                        class="row-input code"
+                        type="text"
+                        v-model="params.smsCode"
+                        placeholder="请输入短信验证码"
+                        maxlength="6"
+                    />
+                    <view class="row-btn" :class="[isMobileDisabled ? 'disabled' : '']">
+                        <button
+                            class="row-input"
+                            type="button"
+                            @click.stop="getMobileCodeFn"
+                            :disabled="isMobileDisabled"
+                        >
+                            {{ mobileCodeText }}
+                        </button>
+                    </view>
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">登录密码:</view>
+                    <input
+                        class="row-input"
+                        type="password"
+                        name="input"
+                        v-model="params.password"
+                        placeholder="密码必须为8-16位字母数字组合"
+                        maxlength="16"
+                    />
+                </view>
+            </view>
+            <view class="register-row clearfix">
+                <view class="register-from">
+                    <view class="label">确认密码:</view>
+                    <input
+                        class="row-input"
+                        type="password"
+                        name="input"
+                        v-model="params.passWordConfirm"
+                        placeholder="请确认密码"
+                        maxlength="16"
+                    />
+                </view>
+            </view>
+            <view class="register-main clearfix">
+                <view class="register-agree">
+                    <view class="agree-text" @tap.stop="agreeCheck()">
+                        <button
+                            class="checkbox iconfont"
+                            :class="[isCheck ? 'icon-gouxuan' : 'icon-weigouxuan']"
+                        ></button>
+                        我已阅读并同意
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">
+                            《机构协议》
+                        </text>
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">
+                            《用户协议》
+                        </text>
+                        及
+                        <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">
+                            《隐私权政策》
+                        </text>
+                    </view>
+                </view>
+                <view class="register-row ">
+                    <view class="register-btn sub" @click.stop="registerStepsfirst">注册</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import authorize from '@/common/config/authorize.js'
+import wxLogin from '@/common/config/wxLogin.js'
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import { beautyList, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import { uploadFileImage } from '@/services/public.js'
+export default {
+    components: {
+        mpvueCityPicker
+    },
+    data() {
+        return {
+            checkRadio: [
+                // 是否需要分配客户经理
+                {
+                    id: 1,
+                    label: '需要'
+                },
+                {
+                    id: 0,
+                    label: '不需要'
+                }
+            ],
+            CustomBar: this.CustomBar, // 顶部导航栏高度
+            isMobileDisabled: false, //手机验证码按钮控制
+            mobilCount: '', //倒计时
+            mobileCodeText: '获取验证码',
+            mobilTime: null,
+            params: {
+                userName: '',
+                bindMobile: '',
+                isAgreed: 0,
+                password: '',
+                passWordConfirm: '',
+                smsCode: '',
+                avatarUrl: '',
+                nickName: '',
+                source: 1,
+                unionId: '',
+                isSp: 1,
+				insideFLag:1, //内外部协销标记 0内部协销,1外部协销
+                spId: '', // 协销分享的id
+            },
+            imageCode: '', //图形验证码
+            imageCodeUrl: '', //图形验证码图片
+            imageCodetoken: '', //图形验证校验
+            isCheck: false, //是否勾选协议
+            userID: '', //机构userID
+            clubID: '' //机构ID
+        }
+    },
+    onLoad(option) {
+		if(option.spId){
+			this.params.spId = option.spId
+			uni.setStorageSync('spId',option.spId)
+			uni.setStorageSync('insideFLag',1)
+		}
+	},
+    computed: {},
+    methods: {
+        ...mapMutations(['login', 'wxLogin']),
+        registerStepsfirst() {
+            if (this.params.userName == '') {
+                this.$util.msg('请输入联系人名称', 2000)
+                return
+            }
+            if (this.params.bindMobile == '') {
+                this.$util.msg('请输入手机号', 2000)
+                return
+            }
+            if (!this.$reg.isMobile(this.params.bindMobile)) {
+                this.$util.msg('手机格式不正确', 2000)
+                return
+            }
+            if (this.params.smsCode == '') {
+                this.$util.msg('请输入手机验证码', 2000)
+                return
+            }
+            if (!this.$reg.isMobileCode(this.params.smsCode)) {
+                this.$util.msg('验证码格式不正确', 2000)
+                return
+            }
+            if (this.params.password == '') {
+                this.$util.msg('请输入密码', 2000)
+                return
+            }
+            if (!this.$reg.checkPwd(this.params.password)) {
+                this.$util.msg('密码必须为8-16位字母数字的组合', 2000)
+                return
+            }
+            if (this.params.passWordConfirm == '') {
+                this.$util.msg('请再次确认密码', 2000)
+                return
+            }
+            if (this.params.passWordConfirm !== this.params.password) {
+                this.$util.msg('两次输入的密码不一致', 2000)
+                return
+            }
+            if (this.params.isAgreed == 0) {
+                this.$util.msg('请勾选同意协议', 2000)
+                return
+            }
+            this.params.unionId = uni.getStorageSync('unionId')
+            this.GetUserProfile()
+        },
+        GetUserProfile() {
+            //获取用户微信个人信息
+            const self = this
+            wx.getUserProfile({
+                desc: '采美采购商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+                success(res) {
+                    console.log('微信获取用户信息新API', res)
+                    self.wxLogin(res.userInfo)
+                    self.params.nickName = res.userInfo.nickName
+                    self.params.avatarUrl = res.userInfo.avatarUrl
+					console.log('spId', uni.getStorageSync('spId'))
+                    if (uni.getStorageSync('spId') * 1 > 0) {
+                        self.params.spId = uni.getStorageSync('spId') * 1
+                    }
+					console.log('params', self.params)
+                    self.UserRegisterClub(self.params)
+                    // 友盟自定义事件
+                    if (process.env.NODE_ENV != 'development') {
+                        self.$uma.trackEvent('Um_Event_ConfirmRegister', {
+                            Um_Key_PageName: '注册机构',
+                            Um_Key_PageCategory: '注册机构页面'
+                        })
+                    }
+                },
+                fail() {
+                    self.$util.msg('授权失败', 2000)
+                }
+            })
+        },
+        UserRegisterClub(params) {
+            this.UserService.UserRegisterClub(params)
+                .then(response => {
+                    wxLogin.wxLoginAuthorize()
+                    setTimeout(() => {
+						uni.removeStorageSync('spId')
+                        this.$api.switchTabTo('/pages/tabBar/user/user')
+                    }, 2000)
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                })
+        },
+        storeUpdataeStatus(data) {
+            uni.setStorageSync('token', data.token)
+            this.$store.commit('updateStatus', data)
+            this.login(data)
+        },
+        getMobileCodeFn() {
+            if (this.params.bindMobile == '') {
+                this.$util.msg('请输入手机号', 2000)
+                return
+            }
+            if (!this.$reg.isMobile(this.params.bindMobile)) {
+                this.$util.msg('请输入正确的手机号', 2000)
+                return
+            }
+            let params = {
+                mobile: this.params.bindMobile,
+                isCheckCaptcha: 1,
+                activateCodeType: 2,
+                platformType: 2
+            }
+            this.isMobileDisabled = true
+            this.PublicService.GetRegisterMobileCode(params)
+                .then(response => {
+                    this.$util.msg('验证短信已发送', 2000)
+                    const TIME_COUNT = 60
+                    if (!this.mobilTime) {
+                        this.mobilCount = TIME_COUNT
+                        this.isMobileDisabled = true
+                        this.mobilTime = setInterval(() => {
+                            if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
+                                this.mobilCount--
+                                this.mobileCodeText = this.mobilCount + 's重新发送'
+                            } else {
+                                this.isMobileDisabled = false
+                                clearInterval(this.mobilTime)
+                                this.mobilTime = null
+                                this.mobileCodeText = '获取验证码'
+                            }
+                        }, 1000)
+                    }
+                })
+                .catch(error => {
+                    this.$util.msg(error.msg, 2000)
+                    this.isMobileDisabled = false
+                })
+        },
+        agreeCheck() {
+            this.isCheck = !this.isCheck
+            if (this.isCheck) {
+                this.params.isAgreed = 1
+            } else {
+                this.params.isAgreed = 0
+            }
+        },
+        async InitAuthorize() {
+            //是否已授权 0:为取消授权 1:为已授权 2:为未操作
+            wxLogin.wxLoginQuick()
+        }
+    },
+    onShow() {
+        this.InitAuthorize()
+    }
+}
+</script>
+
+<style lang="scss">
+.register {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    background-size: contain;
+    .register-main {
+        width: 100%;
+        height: auto;
+        position: relative;
+        .register-consult {
+            width: 110rpx;
+            height: 68rpx;
+            background: linear-gradient(223deg, rgba(225, 86, 21, 0.6) 0%, rgba(225, 86, 10, 0.3) 100%);
+            border-radius: 34rpx 0 0 34rpx;
+            position: absolute;
+            right: 0;
+            bottom: 120rpx;
+            text-align: left;
+            line-height: 68rpx;
+            padding-left: 20rpx;
+            .icon-kefunv {
+                font-size: 48rpx;
+                color: #31313b;
+                float: left;
+            }
+            .text {
+                font-size: $font-size-24;
+                display: block;
+                float: left;
+                width: 60rpx;
+                line-height: 30rpx;
+                color: #ffffff;
+                margin-top: 6rpx;
+            }
+        }
+        .register-agree {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            margin: 100rpx 0 20rpx 0;
+            .agree-text {
+                .checkbox {
+                    float: left;
+                    margin: 4rpx 6rpx 0 0;
+                    color: #999999;
+                    font-size: $font-size-34;
+                    &.icon-gouxuan {
+                        color: $color-system;
+                    }
+                }
+                font-size: $font-size-22;
+                line-height: 44rpx;
+                color: #999999;
+                text {
+                    color: #1890f9;
+                }
+            }
+        }
+        .register-logo {
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            height: 284rpx;
+            padding: 60rpx 0 40rpx 0;
+            .logo {
+                width: 611rpx;
+                height: 284rpx;
+                display: block;
+            }
+        }
+        &.detailed {
+            padding-bottom: 330rpx;
+        }
+        .register-row {
+            width: 100%;
+            height: auto;
+            padding: 0 75rpx;
+            margin-bottom: 30rpx;
+            box-sizing: border-box;
+            .tab-label {
+                color: #666666;
+                font-size: 28rpx;
+            }
+            .tips {
+                color: #ff5b00;
+                font-size: 20rpx;
+            }
+            .check{
+                display: flex;
+                align-item: center;
+                margin-top: 24rpx;
+                .radio {
+                    color: #666666;
+                    font-size: 28rpx;
+                    padding-left: 60rpx;
+                    position: relative;
+                    margin-right: 56rpx;
+                    &::before {
+                        content: '';
+                        width: 32rpx;
+                        height: 32rpx;
+                        border: 1px solid #B2B2B2;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                    }
+                }
+                .isActive {
+                    &::before {
+                        border: 1px solid #FF5B00;
+                        content: '';
+                        width: 32rpx;
+                        height: 32rpx;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                    }
+                    &::after {
+                        content: '';
+                        width: 16rpx;
+                        height: 16rpx;
+                        border-radius: 50%;
+                        position: absolute;
+                        left: 0;
+                        background-color: #FF5B00;
+                        transform: translate(60%, 60%);
+                    }
+                }
+            }
+            &.none {
+                margin-bottom: 0;
+            }
+            &.login {
+                display: flex;
+            }
+            .register-text {
+                line-height: 44rpx;
+                margin-top: 100rpx;
+                font-size: $font-size-24;
+                color: #999999;
+                text-align: justify;
+                .txt {
+                    margin-right: 15rpx;
+                }
+            }
+            .register-title {
+                line-height: 44rpx;
+                font-size: $font-size-24;
+                color: $text-color;
+                text-align: left;
+                &.first {
+                    margin-top: 20rpx;
+                }
+            }
+            .register-tip {
+                line-height: 64rpx;
+                font-size: $font-size-24;
+                color: #cecece;
+                text-align: left;
+            }
+            .register-from {
+                width: 100%;
+                height: 80rpx;
+                background: #ffffff;
+                position: relative;
+                border-bottom: 1px solid #e1e1e1;
+                .label {
+                    text-align: left;
+                    font-size: $font-size-28;
+                    color: #666666;
+                    line-height: 88rpx;
+                    float: left;
+                }
+                .row-input {
+                    width: 440rpx;
+                    padding-left: 10rpx;
+                    font-size: $font-size-28;
+                    color: $text-color;
+                    line-height: 80rpx;
+                    float: left;
+                    height: 80rpx;
+                    &.none {
+                        color: #999999;
+                    }
+                    &.picker {
+                        text-align: left;
+                        color: #333333;
+                    }
+                    &.keshi {
+                        width: 550rpx;
+                    }
+                    &.code {
+                        width: 264rpx;
+                    }
+                }
+                &.img-btn {
+                    width: 220rpx;
+                    height: 80rpx;
+                    padding: 0;
+                    float: left;
+                    background: #ffffff;
+                    display: block;
+                    .vscodeimg {
+                        width: 150rpx;
+                        height: 80rpx;
+                        float: left;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        border-radius: 14rpx;
+                        image {
+                            width: 150rpx;
+                            height: 80rpx;
+                            border-radius: 14rpx;
+                        }
+                    }
+                    .vscod-refresh {
+                        width: 70rpx;
+                        float: right;
+                        text-align: right;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        line-height: 44rpx;
+                        .icon-shuaxin {
+                            font-size: 48rpx;
+                            color: #333333;
+                        }
+                        .ref-text {
+                            font-size: 24rpx;
+                            color: #333333;
+                        }
+                    }
+                }
+                &.imgcode {
+                    width: 410rpx;
+                    float: left;
+                    margin-right: 20rpx;
+                    .row-input {
+                        width: 230rpx;
+                    }
+                }
+                .row-btn {
+                    width: 180rpx;
+                    height: 64rpx;
+                    float: left;
+                    background: $btn-confirm;
+                    padding: 0;
+                    border-radius: 32rpx;
+                    .row-input {
+                        width: 180rpx;
+                        height: 64rpx;
+                        line-height: 64rpx;
+                        padding: 0;
+                        color: #ffffff;
+                        background: $btn-confirm;
+                        text-align: center;
+                        border-radius: 32rpx;
+                        &.other {
+                            width: 180rpx;
+                            background: #f7f7f7;
+                            margin-right: 20rpx;
+                        }
+                        &.none {
+                            background: #f7f7f7;
+                        }
+                    }
+                    &.disabled {
+                        background: #f7f7f7;
+                        .row-input {
+                            background: #f7f7f7;
+                            color: #999999;
+                            font-size: 24rpx;
+                        }
+                    }
+                }
+                &.picker {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: 88rpx;
+                    line-height: 88rpx;
+                    .label {
+                        line-height: 88rpx;
+                    }
+                    .row-input {
+                        width: 470rpx;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 30rpx;
+                    }
+                }
+                &.radio {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: 288rpx;
+                    .row-input {
+                        width: 100%;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 0;
+                    }
+                    .row-radio {
+                        float: left;
+                        transform: scale(0.8);
+                    }
+                    .row-text {
+                        width: 100rpx;
+                        text-align: center;
+                        float: left;
+                    }
+                }
+                &.group {
+                    padding: 0 24rpx;
+                    width: 654rpx;
+                    height: auto;
+                    background: #ffffff;
+                    margin-top: 30rpx;
+                    .label {
+                        line-height: 76rpx;
+                    }
+                    .row-input {
+                        width: 100%;
+                        height: 88rpx;
+                        line-height: 88rpx;
+                        padding-left: 0;
+                    }
+                    .row-radio {
+                        float: left;
+                    }
+                    .row-text {
+                        width: 100rpx;
+                        text-align: center;
+                        float: left;
+                    }
+                }
+                &.btn {
+                    margin-top: 0;
+                }
+                .content-class {
+                    margin: 20rpx auto;
+                    display: flex;
+                    flex-flow: row wrap;
+                    justify-content: space-between;
+                    align-items: center;
+                    &.btn {
+                        margin: 0 auto;
+                        margin-left: 116rpx;
+                    }
+                    .row-input {
+                        display: flex;
+                        width: 220rpx;
+                        height: 40rpx;
+                        padding: 24rpx;
+                        text-align: left;
+                        border-radius: 10rpx;
+                        font-size: $font-size-28;
+                        color: $text-color;
+                    }
+                    .confirm-btn {
+                        width: 200rpx;
+                        height: 88rpx;
+                        border-radius: 10rpx;
+                        line-height: 88rpx;
+                        text-align: center;
+                        &.other {
+                            width: 213rpx;
+                        }
+                        &.none {
+                            color: #ffffff;
+                            background: $btn-confirm;
+                        }
+                        &.disabled {
+                            color: #999999;
+                        }
+                    }
+                    .item {
+                        width: 155rpx;
+                        height: 60rpx;
+                        font-size: $font-size-28;
+                        line-height: 60rpx;
+                        border-radius: 10rpx;
+                        margin: 10rpx;
+                        text-align: center;
+                        box-sizing: border-box;
+                        border: 1rpx solid #efefef;
+                        float: left;
+                        checkbox {
+                            display: none;
+                        }
+                    }
+                    .on {
+                        border-color: $color-system;
+                        color: $color-system;
+                    }
+                }
+            }
+            .row-login {
+                flex: 1;
+                font-size: $font-size-28;
+                color: $text-color;
+                text-align: left;
+            }
+            .row-logincode {
+                flex: 1;
+                font-size: $font-size-28;
+                color: $text-color;
+                text-align: right;
+            }
+            .icon-xiayibu {
+                width: 88rpx;
+                height: 88rpx;
+                position: absolute;
+                right: 0;
+                top: 0;
+                line-height: 88rpx;
+                text-align: center;
+            }
+            &.text-textarea {
+                background: #ffffff;
+                .textarea {
+                    width: 654rpx;
+                    height: 180rpx;
+                    background: #f7f7f7;
+                    padding: 24rpx;
+                    font-size: $font-size-28;
+                    color: $text-color;
+                    z-index: 1;
+                    border-radius: 14rpx;
+                }
+                .textarea.hide {
+                    opacity: 0;
+                }
+                .textarea.show {
+                    color: #999999;
+                }
+            }
+        }
+        .register-picture {
+            height: 102rpx;
+            margin: 30rpx 0;
+            width: 42%;
+            float: left;
+            &.zz {
+                width: 100%;
+            }
+            .label {
+                float: left;
+                font-size: $font-size-28;
+                color: $text-color;
+                line-height: 102rpx;
+                width: 150rpx;
+                text-align: right;
+                &.zz {
+                    width: 230rpx;
+                }
+            }
+            .upload-picture {
+                float: left;
+                height: 100rpx;
+                .upload-none {
+                    width: 100rpx;
+                    height: 100rpx;
+                    text-align: center;
+                    line-height: 100rpx;
+                    color: #999999;
+                    border: 1px solid #999999;
+                    border-radius: 10rpx;
+                    margin: 0 20rpx;
+                    .iconfont {
+                        font-size: $font-size-28;
+                    }
+                }
+                .upload-image {
+                    width: 100rpx;
+                    height: 100rpx;
+                    border-radius: 10rpx;
+                    margin: 0 20rpx;
+                    position: relative;
+                    image {
+                        width: 100rpx;
+                        height: 100rpx;
+                        border-radius: 10rpx;
+                    }
+                    .upload-del {
+                        width: 40rpx;
+                        height: 40rpx;
+                        position: absolute;
+                        top: -20rpx;
+                        right: -20rpx;
+                        line-height: 40rpx;
+                        text-align: center;
+                        .iconfont {
+                            font-size: $font-size-32;
+                            color: #999999;
+                        }
+                    }
+                }
+            }
+        }
+        .register-input {
+            width: 654rpx;
+            height: 40rpx;
+            padding: 24rpx;
+            margin: 0 auto;
+            margin-bottom: 60rpx;
+            background: #f7f7f7;
+            border-radius: 14rpx;
+            .input {
+                width: 100%;
+                height: 100%;
+                background: #f7f7f7;
+                font-size: $font-size-28;
+                line-height: 40rpx;
+                color: #333333;
+                border-radius: 14rpx;
+            }
+        }
+        .register-fiexd {
+            width: 100%;
+            height: auto;
+            position: fixed;
+            bottom: 0;
+            left: 0;
+            z-index: 999;
+            background: #ffffff;
+        }
+        .register-btn {
+            width: 100%;
+            height: 88rpx;
+            border-radius: 44rpx;
+            font-size: $font-size-28;
+            line-height: 88rpx;
+            color: #ffffff;
+            margin: 0 auto;
+            text-align: center;
+            background: $btn-confirm;
+            margin-top: 96rpx;
+            &.none {
+                border: 1px solid $color-system;
+                background: #ffffff;
+                color: $color-system;
+                margin-top: 0;
+            }
+            &.sub {
+                margin-top: 0;
+            }
+        }
+    }
+}
+</style>

pages/login/register.vue

@@ -171,6 +171,7 @@ export default {
                 source: 1,
                 unionId: '',
                 isSp: 1,
+				insideFLag:0, //内外部协销标记 0内部协销,1外部协销
                 spId: '', // 协销分享的id
             },
             imageCode: '', //图形验证码
@@ -194,7 +195,6 @@ export default {
                 })
             })
         },
-
         registerStepsfirst() {
             if (this.params.userName == '') {
                 this.$util.msg('请输入联系人名称', 2000)
@@ -250,8 +250,10 @@ export default {
                     self.params.nickName = res.userInfo.nickName
                     self.params.avatarUrl = res.userInfo.avatarUrl
 					console.log('spId', uni.getStorageSync('spId'))
+					console.log('insideFLag', uni.getStorageSync('insideFLag'))
                     if (uni.getStorageSync('spId') * 1 > 0) {
                         self.params.spId = uni.getStorageSync('spId') * 1
+                        self.params.insideFLag = uni.getStorageSync('insideFLag') * 1
                     }
 					console.log('params', self.params)
                     self.UserRegisterClub(self.params)

pages/login/supplier_login.vue

@@ -93,7 +93,7 @@
         <tui-modal :show="show" custom @cancel="cancel">
             <view class="tui-modal-custom">
                 <view class="tui-modal-custom-text">周一至周五 9:00~1800</view>
-                <view class="tui-modal-custom-phone" @click=";(modal = true), (show = false)">153-3889-7365</view>
+                <view class="tui-modal-custom-phone" @click=";(modal = true), (show = false)">131-6478-0233</view>
             </view>
         </tui-modal>
         <tui-modal :show="isPhone" class="qrcode" custom @cancel="cancel">
@@ -110,7 +110,7 @@
             <view class="tui-modal-custom-call">
                 <view class="tui-modal-custom-text">
                     确定拨打
-                    <text style="color: #FF5B00;font-weight: bold;margin: 0 6rpx;">153-3889-7365</text>
+                    <text style="color: #FF5B00;font-weight: bold;margin: 0 6rpx;">131-6478-0233</text>
                     吗？
                 </view>
                 <view class="modal-btns">
@@ -300,7 +300,7 @@ export default {
         // 拨打电话
         handleClick() {
             uni.makePhoneCall({
-                phoneNumber: '153-3889-7365' //仅为示例
+                phoneNumber: '131-6478-0233' //仅为示例
             })
             this.modal = false
         },
@@ -451,7 +451,7 @@ export default {
     }
     .tui-modal-custom-qrcode {
         width: 412rpx;
-        height: 412rpx;
+        height: 460rpx;
     }
 }
 .modal-btns {

pages/search/mixins/searchMixins.js

@@ -17,7 +17,11 @@ const searchMixins = {
             }
             return ''
         },
-        highLight(content, key, res) {
+        isInterceptHtmlFn(text) {
+            let name = this.$reg.interceptHtmlFn(text)
+            return name
+        },
+        handeleCeptText(content, key, res) {
             if (res == undefined) {
                 res = []
             }
@@ -39,7 +43,7 @@ const searchMixins = {
                         text: y
                     })
                     content = content.substring(index + keyLen, content.length)
-                    this.highLight(content, key, res)
+                    this.handeleCeptText(content, key, res)
                 } else {
                     res.push({
                         type: 2,

pages/search/search.vue

@@ -202,10 +202,15 @@
 						<view class="list-details-title clearfix">
 							<text class="mclap-tag" v-if="pros.beautyActFlag == 1">美博会</text>
 							<view class="mclap" :class="pros.beautyActFlag == 1 ? 'indent' : ''">
-								<view v-for="item in highLight(isInterceptHtmlFn(pros.name),listQuery.keyword)" :key="item" style="float:left;">
-								  <text v-if="item.type==1" decode="true" space="true" style='color: #ff5b00;'>{{ myReplace(item.text) }} </text>
-								  <text v-else decode="true" space="true">{{myReplace(item.text)}}</text>
-								</view>
+								<text v-for="(item, itemIndex) in handeleCeptText(isInterceptHtmlFn(pros.name),listQuery.keyword)" 
+									  :key="itemIndex" 
+									  :style="{ color : item.type === 1 ? '#ff5b00' : '#333333' }">
+									{{ item.text }}
+								</text>
+								<!-- <view v-for="(item, itemIndex) in pros.name" :key="itemIndex" style="float:left;">
+								  <text v-if="item.type ==1" style='color: #ff5b00;'>{{ item.text }} </text>
+								  <text v-else>{{ item.text }}</text>
+								</view> -->
 							</view>
 						</view>
 						<text class="list-details-specs">规格：{{ pros.unit }}</text>
@@ -754,6 +759,7 @@ export default {
 					if (loadMore) {
 						this.listData = [...this.listData, ...dataList]
 						this.getProductPrice()
+						
 					} else {
 						this.listData = [...dataList]
 						this.getProductPrice()
@@ -971,10 +977,6 @@ export default {
 				this.isFocus = true
 			}
 		},
-		isInterceptHtmlFn(text) {
-			let name = this.$reg.interceptHtmlFn(text)
-			return name
-		},
 		navToDetailPage(id) {
 			this.isModallayer = true
 			this.$api.navigateTo(`/pages/goods/product?id=${id}`)
@@ -1066,7 +1068,6 @@ export default {
 			}
 		},
 		topBubble() {
-			console.log('1111111111')
 			//显隐搜索项
 			this.showBubblePopup = !this.showBubblePopup
 		}

pages/seller/cart/components/immediatelyList.vue

@@ -254,7 +254,7 @@
 			:skuProduct="handleProsData"
 			@handleUnitConfirm="hanldeSupporUnitConfirm"
 			@skuClick="handleSkuClick"
-		></cmUnitSupporPopup>
+		/>
 		<!-- 可拖动悬浮按钮 -->
 		<cm-drag
 			v-if="!showSkeleton"
@@ -264,10 +264,9 @@
 			@btnClick="btnClick"
 			@btnTouchstart="btnTouchstart"
 			@btnTouchend="btnTouchend"
-		>
-		</cm-drag>
+		/>
 		<!-- 透明模态层 -->
-		<modal-layer v-if="isModallayer"></modal-layer>
+		<modal-layer v-if="isModallayer" />
 	</view>
 </template>
 
@@ -423,6 +422,7 @@ export default {
 							this.isShowEmptyText = '暂无相关商品'
 						}
 					}
+					this.showSkeleton = false
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -510,7 +510,6 @@ export default {
 							this.combinationProduct = [...this.combinationProduct, ...responseData.results]
 						} else {
 							this.combinationProduct = [...responseData.results]
-
 							this.showSkeleton = false
 						}
 						// 防上拉暴滑
@@ -527,6 +526,7 @@ export default {
 						}
 					} else {
 						this.isShowEmpty = true
+						this.showSkeleton = false
 						this.isShowEmptyText = '暂无相关商品'
 					}
 				})

pages/seller/login/register-invite.vue

@@ -0,0 +1,859 @@
+<template>
+	<view class="container login">
+		<view class="login-main">
+			<text class="logo-titl">本页面不用填写！</text>
+			<text class="logo-text">点击右上方<text class="sp">···</text>，选择“发送给朋友”，</text>
+			<text class="logo-text">将本页面发送给客户进行机构注册，注册成功后将自动成为你名下的机构客户。</text>
+		</view>
+		<view class="register-main clearfix">
+		    <view class="register-logo">
+		        <image class="logo" src="https://static.caimei365.com/app/img/icon/logo@2x.png" mode=""></image>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">联系人:</view>
+		            <input
+		                class="row-input"
+		                type="text"
+		                name="input"
+		                v-model="params.userName"
+						disabled="true"
+		                placeholder="请输入机构联系人姓名"
+		                maxlength="6"
+		            />
+		        </view>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">手机号:</view>
+		            <input
+		                class="row-input"
+		                type="number"
+		                name="input"
+		                v-model="params.bindMobile"
+						disabled="true"
+		                placeholder="请输入联系人常用手机号"
+		                maxlength="11"
+		            />
+		        </view>
+		    </view>
+		    <view class="register-row clearfix">
+		        <view class="register-from">
+		            <view class="label">短信验证码:</view>
+		            <input
+		                class="row-input code"
+		                type="text"
+		                v-model="params.smsCode"
+						disabled="true"
+		                placeholder="请输入短信验证码"
+		                maxlength="6"
+		            />
+		            <view class="row-btn" :class="[isMobileDisabled ? 'disabled' : '']">
+		                <button
+		                    class="row-input"
+		                    type="button"
+		                    @click.stop="getMobileCodeFn"
+		                    disabled="true"
+		                >
+		                    {{ mobileCodeText }}
+		                </button>
+		            </view>
+		        </view>
+		    </view>
+		    <view class="register-main clearfix">
+		        <view class="register-agree">
+		            <view class="agree-text" @tap.stop="agreeCheck()">
+		                <button
+		                    class="checkbox iconfont"
+							disabled="true"
+		                    :class="[isCheck ? 'icon-gouxuan' : 'icon-weigouxuan']"
+		                ></button>
+		                我已阅读并同意
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')">
+		                    《机构协议》
+		                </text>
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">
+		                    《用户协议》
+		                </text>
+		                及
+		                <text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">
+		                    《隐私权政策》
+		                </text>
+		            </view>
+		        </view>
+		        <view class="register-row ">
+		            <view class="register-btn sub">注册</view>
+		        </view>
+		    </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import authorize from '@/common/config/authorize.js' 
+	export default{
+		data() {
+			return{
+				spId:0,
+				userName:'',
+				userId:0,
+				mobileCodeText:'获取验证码'
+			}
+		},
+		onLoad(option) {
+			this.initGetStotage()
+		},
+		methods:{
+			async initGetStotage() {
+				// 初始化
+				const userInfo = await this.$api.getStorage()
+				this.spId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
+				this.userName = userInfo.userName ? userInfo.userName : ''
+			}
+		},
+		onShareAppMessage(res){//分享转发
+			if (res.from === 'button') { // 来自页面内转发按钮
+		    }
+			return {
+			  title: `${this.userName}邀请你注册采美机构用户啦~`,
+			  path: `pages/login/register-invite-club?spId=${this.spId}`,
+			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
+			}
+		},
+		onShow() {
+			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.userId = resolve.userId
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.login{
+		width: 100%;
+		height: auto;
+		border-top: 1px solid #F7F7F7;
+		.model-warp.none{
+			display: none;			
+		}
+		.model-warp.show{
+			display: block;
+		}
+		.login-main{
+			width: 682rpx;		
+			background: rgba(0, 0, 0, 0.6);
+			display: flex;
+			flex-direction: column;
+			height: 164rpx;
+			margin: 18rpx auto 0;
+			box-sizing: border-box;
+			padding: 20rpx;
+			border-radius: 16rpx;
+			position: relative;
+			&:before {
+				content: '';
+				width: 0;
+				height: 0;
+				border: 15rpx solid transparent;
+				border-bottom: 15rpx solid rgba(0, 0, 0, 0.6);
+				position: absolute;
+				top: -29rpx;
+				right: 88rpx;
+			}
+			.logo-titl{
+				font-size: 28rpx;
+				line-height: 34rpx;
+				color:#FFFFFF;
+			}
+			.logo-text{
+				font-size: 24rpx;
+				line-height: 34rpx;
+				color:#FFFFFF;
+				.sp{
+					color:#FFFFFF;
+					font-weight: bold;
+				}
+			}
+		}
+		.login-form{
+			width: 702rpx;
+			height: auto;
+			padding: 0 24rpx;
+			.login-input{
+				width: 654rpx;
+				height: 40rpx;
+				padding: 24rpx;
+				margin-bottom: 20rpx;
+				background: #F7F7F7;
+				border-radius: 14rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				&.code{
+					width: 370rpx;
+					float: left;
+					margin-right: 20rpx;
+				}
+				&.btn{
+					width: 258rpx;
+					height: 88rpx;
+					padding: 0;
+					float: left;
+					background: $btn-confirm;
+					.input{
+						width: 258rpx;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding: 0;
+						border-radius: 14rpx;
+						color: #FFFFFF;
+						background: $btn-confirm;
+					}
+					&.disabled{
+						background: #F7F7F7;
+						.input{
+							background: #F7F7F7;
+							color: #999999;
+						}
+					}
+				}
+				&.img-btn{
+					width: 250rpx;
+					height: 88rpx;
+					padding: 0;
+					float: left;
+					background: #FFFFFF;
+					display: block;
+					.vscodeimg{
+						width: 180rpx;
+						height: 88rpx;
+						float: left;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						border-radius: 14rpx;
+						image{
+							width: 180rpx;
+							height: 88rpx;
+							border-radius: 14rpx;
+						}
+					}
+					.vscod-refresh{
+						width: 70rpx;
+						float: right;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						.icon-shuaxin{
+							font-size: 48rpx;
+							color: #333333;
+						}
+						.ref-text{
+							font-size: 24rpx;
+							color: #333333;
+						}
+					}
+				}
+				.input{
+					width: 100%;
+					height: 100%;
+					background: #F7F7F7;
+					font-size: $font-size-28;
+					line-height: 40rpx;
+					color: #333333;
+					border-radius: 14rpx;
+				}
+			}
+		}
+		.login-btn{
+			width: 702rpx;
+			height: 88rpx;
+			border-radius: 44rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #FFFFFF;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
+			margin-top: 100rpx;
+		}
+		.model-authorization{
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 999;
+			.authorization{
+				width: 518rpx;
+				height: 320rpx;
+				position: absolute;
+				background: rgba(255,255,255,.7);
+				left: 0;
+				right: 0;
+				bottom: 0;
+				top: 0;
+				margin: auto;
+				.to-btn{
+					position: absolute;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					margin: auto;
+					width: 70%;
+					height: 88rpx;
+					font-size: $font-size-28;
+					line-height: 88rpx;
+					color: #FFFFFF;
+					text-align: center;
+					border-radius: 44rpx;
+				}
+			}
+		}
+		.register-main {
+		    width: 100%;
+		    height: auto;
+		    position: relative;
+		    .register-consult {
+		        width: 110rpx;
+		        height: 68rpx;
+		        background: linear-gradient(223deg, rgba(225, 86, 21, 0.6) 0%, rgba(225, 86, 10, 0.3) 100%);
+		        border-radius: 34rpx 0 0 34rpx;
+		        position: absolute;
+		        right: 0;
+		        bottom: 120rpx;
+		        text-align: left;
+		        line-height: 68rpx;
+		        padding-left: 20rpx;
+		        .icon-kefunv {
+		            font-size: 48rpx;
+		            color: #31313b;
+		            float: left;
+		        }
+		        .text {
+		            font-size: $font-size-24;
+		            display: block;
+		            float: left;
+		            width: 60rpx;
+		            line-height: 30rpx;
+		            color: #ffffff;
+		            margin-top: 6rpx;
+		        }
+		    }
+		    .register-agree {
+		        display: flex;
+		        flex-direction: column;
+		        align-items: center;
+		        margin: 100rpx 0 20rpx 0;
+		        .agree-text {
+		            .checkbox {
+		                float: left;
+		                margin: 4rpx 6rpx 0 0;
+		                color: #999999;
+		                font-size: $font-size-34;
+		                &.icon-gouxuan {
+		                    color: $color-system;
+		                }
+		            }
+		            font-size: $font-size-22;
+		            line-height: 44rpx;
+		            color: #999999;
+		            text {
+		                color: #1890f9;
+		            }
+		        }
+		    }
+		    .register-logo {
+		        width: 100%;
+		        display: flex;
+		        flex-direction: column;
+		        align-items: center;
+		        height: 284rpx;
+		        .logo {
+		            width: 611rpx;
+		            height: 284rpx;
+		            display: block;
+		        }
+		    }
+		    &.detailed {
+		        padding-bottom: 330rpx;
+		    }
+		    .register-row {
+		        width: 100%;
+		        height: auto;
+		        padding: 0 75rpx;
+		        margin-bottom: 30rpx;
+		        box-sizing: border-box;
+		        .tab-label {
+		            color: #666666;
+		            font-size: 28rpx;
+		        }
+		        .tips {
+		            color: #ff5b00;
+		            font-size: 20rpx;
+		        }
+		        .check{
+		            display: flex;
+		            align-item: center;
+		            margin-top: 24rpx;
+		            .radio {
+		                color: #666666;
+		                font-size: 28rpx;
+		                padding-left: 60rpx;
+		                position: relative;
+		                margin-right: 56rpx;
+		                &::before {
+		                    content: '';
+		                    width: 32rpx;
+		                    height: 32rpx;
+		                    border: 1px solid #B2B2B2;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                }
+		            }
+		            .isActive {
+		                &::before {
+		                    border: 1px solid #FF5B00;
+		                    content: '';
+		                    width: 32rpx;
+		                    height: 32rpx;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                }
+		                &::after {
+		                    content: '';
+		                    width: 16rpx;
+		                    height: 16rpx;
+		                    border-radius: 50%;
+		                    position: absolute;
+		                    left: 0;
+		                    background-color: #FF5B00;
+		                    transform: translate(60%, 60%);
+		                }
+		            }
+		        }
+		        &.none {
+		            margin-bottom: 0;
+		        }
+		        &.login {
+		            display: flex;
+		        }
+		        .register-text {
+		            line-height: 44rpx;
+		            margin-top: 100rpx;
+		            font-size: $font-size-24;
+		            color: #999999;
+		            text-align: justify;
+		            .txt {
+		                margin-right: 15rpx;
+		            }
+		        }
+		        .register-title {
+		            line-height: 44rpx;
+		            font-size: $font-size-24;
+		            color: $text-color;
+		            text-align: left;
+		            &.first {
+		                margin-top: 20rpx;
+		            }
+		        }
+		        .register-tip {
+		            line-height: 64rpx;
+		            font-size: $font-size-24;
+		            color: #cecece;
+		            text-align: left;
+		        }
+		        .register-from {
+		            width: 100%;
+		            height: 80rpx;
+		            background: #ffffff;
+		            position: relative;
+		            border-bottom: 1px solid #e1e1e1;
+		            .label {
+		                text-align: left;
+		                font-size: $font-size-28;
+		                color: #666666;
+		                line-height: 88rpx;
+		                float: left;
+		            }
+		            .row-input {
+		                width: 440rpx;
+		                padding-left: 10rpx;
+		                font-size: $font-size-28;
+		                color: $text-color;
+		                line-height: 80rpx;
+		                float: left;
+		                height: 80rpx;
+		                &.none {
+		                    color: #999999;
+		                }
+		                &.picker {
+		                    text-align: left;
+		                    color: #333333;
+		                }
+		                &.keshi {
+		                    width: 550rpx;
+		                }
+		                &.code {
+		                    width: 264rpx;
+		                }
+		            }
+		            &.img-btn {
+		                width: 220rpx;
+		                height: 80rpx;
+		                padding: 0;
+		                float: left;
+		                background: #ffffff;
+		                display: block;
+		                .vscodeimg {
+		                    width: 150rpx;
+		                    height: 80rpx;
+		                    float: left;
+		                    display: flex;
+		                    flex-direction: column;
+		                    align-items: center;
+		                    border-radius: 14rpx;
+		                    image {
+		                        width: 150rpx;
+		                        height: 80rpx;
+		                        border-radius: 14rpx;
+		                    }
+		                }
+		                .vscod-refresh {
+		                    width: 70rpx;
+		                    float: right;
+		                    text-align: right;
+		                    display: flex;
+		                    flex-direction: column;
+		                    align-items: center;
+		                    line-height: 44rpx;
+		                    .icon-shuaxin {
+		                        font-size: 48rpx;
+		                        color: #333333;
+		                    }
+		                    .ref-text {
+		                        font-size: 24rpx;
+		                        color: #333333;
+		                    }
+		                }
+		            }
+		            &.imgcode {
+		                width: 410rpx;
+		                float: left;
+		                margin-right: 20rpx;
+		                .row-input {
+		                    width: 230rpx;
+		                }
+		            }
+		            .row-btn {
+		                width: 180rpx;
+		                height: 64rpx;
+		                float: left;
+		                background: $btn-confirm;
+		                padding: 0;
+		                border-radius: 32rpx;
+		                .row-input {
+		                    width: 180rpx;
+		                    height: 64rpx;
+		                    line-height: 64rpx;
+		                    padding: 0;
+		                    color: #ffffff;
+		                    background: $btn-confirm;
+		                    text-align: center;
+		                    border-radius: 32rpx;
+		                    &.other {
+		                        width: 180rpx;
+		                        background: #f7f7f7;
+		                        margin-right: 20rpx;
+		                    }
+		                    &.none {
+		                        background: #f7f7f7;
+		                    }
+		                }
+		                &.disabled {
+		                    background: #f7f7f7;
+		                    .row-input {
+		                        background: #f7f7f7;
+		                        color: #999999;
+		                        font-size: 24rpx;
+		                    }
+		                }
+		            }
+		            &.picker {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: 88rpx;
+		                line-height: 88rpx;
+		                .label {
+		                    line-height: 88rpx;
+		                }
+		                .row-input {
+		                    width: 470rpx;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 30rpx;
+		                }
+		            }
+		            &.radio {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: 288rpx;
+		                .row-input {
+		                    width: 100%;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 0;
+		                }
+		                .row-radio {
+		                    float: left;
+		                    transform: scale(0.8);
+		                }
+		                .row-text {
+		                    width: 100rpx;
+		                    text-align: center;
+		                    float: left;
+		                }
+		            }
+		            &.group {
+		                padding: 0 24rpx;
+		                width: 654rpx;
+		                height: auto;
+		                background: #ffffff;
+		                margin-top: 30rpx;
+		                .label {
+		                    line-height: 76rpx;
+		                }
+		                .row-input {
+		                    width: 100%;
+		                    height: 88rpx;
+		                    line-height: 88rpx;
+		                    padding-left: 0;
+		                }
+		                .row-radio {
+		                    float: left;
+		                }
+		                .row-text {
+		                    width: 100rpx;
+		                    text-align: center;
+		                    float: left;
+		                }
+		            }
+		            &.btn {
+		                margin-top: 0;
+		            }
+		            .content-class {
+		                margin: 20rpx auto;
+		                display: flex;
+		                flex-flow: row wrap;
+		                justify-content: space-between;
+		                align-items: center;
+		                &.btn {
+		                    margin: 0 auto;
+		                    margin-left: 116rpx;
+		                }
+		                .row-input {
+		                    display: flex;
+		                    width: 220rpx;
+		                    height: 40rpx;
+		                    padding: 24rpx;
+		                    text-align: left;
+		                    border-radius: 10rpx;
+		                    font-size: $font-size-28;
+		                    color: $text-color;
+		                }
+		                .confirm-btn {
+		                    width: 200rpx;
+		                    height: 88rpx;
+		                    border-radius: 10rpx;
+		                    line-height: 88rpx;
+		                    text-align: center;
+		                    &.other {
+		                        width: 213rpx;
+		                    }
+		                    &.none {
+		                        color: #ffffff;
+		                        background: $btn-confirm;
+		                    }
+		                    &.disabled {
+		                        color: #999999;
+		                    }
+		                }
+		                .item {
+		                    width: 155rpx;
+		                    height: 60rpx;
+		                    font-size: $font-size-28;
+		                    line-height: 60rpx;
+		                    border-radius: 10rpx;
+		                    margin: 10rpx;
+		                    text-align: center;
+		                    box-sizing: border-box;
+		                    border: 1rpx solid #efefef;
+		                    float: left;
+		                    checkbox {
+		                        display: none;
+		                    }
+		                }
+		                .on {
+		                    border-color: $color-system;
+		                    color: $color-system;
+		                }
+		            }
+		        }
+		        .row-login {
+		            flex: 1;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            text-align: left;
+		        }
+		        .row-logincode {
+		            flex: 1;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            text-align: right;
+		        }
+		        .icon-xiayibu {
+		            width: 88rpx;
+		            height: 88rpx;
+		            position: absolute;
+		            right: 0;
+		            top: 0;
+		            line-height: 88rpx;
+		            text-align: center;
+		        }
+		        &.text-textarea {
+		            background: #ffffff;
+		            .textarea {
+		                width: 654rpx;
+		                height: 180rpx;
+		                background: #f7f7f7;
+		                padding: 24rpx;
+		                font-size: $font-size-28;
+		                color: $text-color;
+		                z-index: 1;
+		                border-radius: 14rpx;
+		            }
+		            .textarea.hide {
+		                opacity: 0;
+		            }
+		            .textarea.show {
+		                color: #999999;
+		            }
+		        }
+		    }
+		    .register-picture {
+		        height: 102rpx;
+		        margin: 30rpx 0;
+		        width: 42%;
+		        float: left;
+		        &.zz {
+		            width: 100%;
+		        }
+		        .label {
+		            float: left;
+		            font-size: $font-size-28;
+		            color: $text-color;
+		            line-height: 102rpx;
+		            width: 150rpx;
+		            text-align: right;
+		            &.zz {
+		                width: 230rpx;
+		            }
+		        }
+		        .upload-picture {
+		            float: left;
+		            height: 100rpx;
+		            .upload-none {
+		                width: 100rpx;
+		                height: 100rpx;
+		                text-align: center;
+		                line-height: 100rpx;
+		                color: #999999;
+		                border: 1px solid #999999;
+		                border-radius: 10rpx;
+		                margin: 0 20rpx;
+		                .iconfont {
+		                    font-size: $font-size-28;
+		                }
+		            }
+		            .upload-image {
+		                width: 100rpx;
+		                height: 100rpx;
+		                border-radius: 10rpx;
+		                margin: 0 20rpx;
+		                position: relative;
+		                image {
+		                    width: 100rpx;
+		                    height: 100rpx;
+		                    border-radius: 10rpx;
+		                }
+		                .upload-del {
+		                    width: 40rpx;
+		                    height: 40rpx;
+		                    position: absolute;
+		                    top: -20rpx;
+		                    right: -20rpx;
+		                    line-height: 40rpx;
+		                    text-align: center;
+		                    .iconfont {
+		                        font-size: $font-size-32;
+		                        color: #999999;
+		                    }
+		                }
+		            }
+		        }
+		    }
+		    .register-input {
+		        width: 654rpx;
+		        height: 40rpx;
+		        padding: 24rpx;
+		        margin: 0 auto;
+		        margin-bottom: 60rpx;
+		        background: #f7f7f7;
+		        border-radius: 14rpx;
+		        .input {
+		            width: 100%;
+		            height: 100%;
+		            background: #f7f7f7;
+		            font-size: $font-size-28;
+		            line-height: 40rpx;
+		            color: #333333;
+		            border-radius: 14rpx;
+		        }
+		    }
+		    .register-fiexd {
+		        width: 100%;
+		        height: auto;
+		        position: fixed;
+		        bottom: 0;
+		        left: 0;
+		        z-index: 999;
+		        background: #ffffff;
+		    }
+		    .register-btn {
+		        width: 100%;
+		        height: 88rpx;
+		        border-radius: 44rpx;
+		        font-size: $font-size-28;
+		        line-height: 88rpx;
+		        color: #ffffff;
+		        margin: 0 auto;
+		        text-align: center;
+		        background: $btn-confirm;
+		        margin-top: 96rpx;
+		        &.none {
+		            border: 1px solid $color-system;
+		            background: #ffffff;
+		            color: $color-system;
+		            margin-top: 0;
+		        }
+		        &.sub {
+		            margin-top: 0;
+		        }
+		    }
+		}
+	}
+</style>

pages/seller/login/register-select.vue

@@ -15,7 +15,10 @@
 					<view class="text">资质机构</view> <view class="text none">（原会员机构）</view>
 				</view>
 			</view>
-			<view class="main-item-text"> 提示：请尽量搜集客户完整信息，优先注册资质机构 </view>
+			<view class="main-item-text" v-if="insideFLag === 1" @click.stop="this.$api.navigateTo('/pages/seller/login/register-invite')"> 
+				邀请机构注册 
+				<text class="iconfont icon-youjiantou"></text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -23,11 +26,21 @@
 <script>
 export default {
 	data() {
-		return {}
+		return {
+			insideFLag:0
+		}
+	},
+	onLoad() {
+		this.initGetStotage()
 	},
-	onLoad(option) {},
 	computed: {},
-	methods: {}
+	methods: {
+		async initGetStotage() {
+			// 初始化
+			const userInfo = await this.$api.getStorage()
+			this.insideFLag = userInfo.insideFLag ? userInfo.insideFLag : 0
+		}
+	}
 }
 </script>
 
@@ -48,9 +61,9 @@ export default {
 			box-sizing: border-box;
 			margin-top: 150rpx;
 			text-align: center;
-			font-size: 24rpx;
+			font-size: 28rpx;
 			line-height: 100rpx;
-			color: #fea785;
+			color: #FF5B00;
 		}
 		.main-item {
 			width: 100%;

pages/seller/notice/components/trajectory.vue

@@ -3,7 +3,7 @@
         <view class="title">访问轨迹</view>
         <time-axis v-for="item in trajectoryList" :key="item.userID">
             <template #title>
-                <text>{{item.accessTime}})(停留时长{{ item.accessDuration }})</text>
+                <text>{{item.accessTime}}(停留时长{{ item.accessDuration }})</text>
             </template>
             <template #content>
                 <view class="time-axis-content">

pages/seller/remarks/add-record.vue

@@ -637,10 +637,12 @@ export default {
 			})
 			console.log('trendsLabelsList', trendsLabelsList)
 			// 标签必须有一项
-			if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
-				  this.modal = true
-				  this.contentModalText = '标签必须选择或者填写一项' 
-				  return
+			if(this.remarksParams.communicationSituation !== 1){
+				if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
+					  this.modal = true
+					  this.contentModalText = '标签必须选择或者填写一项' 
+					  return
+				}
 			}
 			if(this.firstLabelList.length > 0){
 				this.remarksParams.remarks = JSON.stringify(this.firstLabelList)

pages/seller/remarks/add.vue

@@ -704,10 +704,12 @@ export default {
 			})
 			console.log('trendsLabelsList', trendsLabelsList)
 			// 标签必须有一项
-			if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
-				  this.modal = true
-				  this.contentModalText = '标签必须选择或者填写一项' 
-				  return
+			if(this.remarksParams.communicationSituation !== 1){
+				if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
+					  this.modal = true
+					  this.contentModalText = '标签必须选择或者填写一项' 
+					  return
+				}
 			}
 			if(this.firstLabelList.length > 0){
 				this.remarksParams.remarks = JSON.stringify(this.firstLabelList)

services/config.env.js

@@ -6,7 +6,7 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
     URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'   
+    // URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'