协销优化

pages.json

@@ -1139,6 +1139,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "activity/activity-entry",
+					"style": {
+						"navigationBarTitleText": "紫亚兰签到",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "other/repair",
 					"style": {

pages/h5/activity/activity-entry.vue

@@ -0,0 +1,159 @@
+<template>
+	<view class="container cashier">
+        <view class="container-banner" :style="{paddingTop:CustomBar + 230 +'px'}">
+            <view class="login-input">
+            	<input type="text" 
+            		   v-model="params.name"
+            		   maxlength="20" 
+            		   class="input" 
+            		   placeholder="请填写您的姓名"
+            	/>
+            </view>
+            <view class="login-input">
+            	<input type="number" 
+            		   v-model="params.shareCode"
+            		   maxlength="11" 
+            		   class="input" 
+            		   placeholder="请填写您的手机号"
+            	/>
+            </view>
+            <view class="login-btn"  @click="handleEntry">大会签到</view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				shopOrderId:0,
+				payType:'',
+				payStatus:true,
+				payBtnStatus:false,
+				amuntMoney:0,
+				successText:'订单支付失败',
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				params:{
+                    name:'',
+                    shareCode:'' 
+                }
+			}
+		},
+		filters:{
+			NumFormat(value) {
+			    //处理金额
+			    if (value) {
+			        return Number(value).toFixed(2)
+			    } else {
+			        return '0.00'
+			    }
+			}
+		},
+		onLoad(option) {
+			this.initData(option)
+		},
+		methods:{
+			initOrderInfo() {
+			    this.orderInfo = uni.getStorageSync('orderInfo')
+			    uni.removeStorageSync('orderInfo')
+			},
+            handleEntry(){
+                if(!this.params.name){
+                	this.$util.msg('请填写您的姓名',2000) 
+                	return
+                }
+                if(!this.params.shareCode){
+                	this.$util.msg('请填写您的联系方式',2000) 
+                	return
+                }
+            },
+			initData(option){
+				const data = JSON.parse(option.data)
+				this.orderId = data.data.orderId
+				this.shopOrderId = data.data.shopOrderId
+				this.payType = data.data.type
+				this.amuntMoney = data.data.payAmount
+				if(this.payType == 'success'){
+					this.payStatus = true
+					this.successText = '订单支付成功'
+				}else{
+					this.payStatus = false
+					this.successText = '订单支付失败'
+				}
+				this.PayOrderCheckoutCounter(this.shopOrderId)
+			},
+			async PayOrderCheckoutCounter(shopOrderId){//初始化支付信息
+				try{
+					const res = await this.PayService.PayOrderCheckoutCounter({ shopOrderId : shopOrderId })
+					const data = res.data.shopOrder
+					const status = data.status //子订单状态
+					this.mapStateArr.forEach(value => {
+						if(status === value){
+							this.payBtnStatus = true
+						}
+					})
+					this.isRepuest = true
+				}catch(error){
+					this.$util.msg(error.msg,2000)
+				}
+			},
+			toAgainPay(){
+				this.$api.reLaunch(`/pages/user/order/order-pay-list?shopOrderId=${this.shopOrderId}`)
+			},
+			details(){
+				this.$api.reLaunch('/pages/user/order/order-details?type=share&shopOrderId='+this.shopOrderId)
+			}
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+        background-color: #3d68eb;
+		height: auto !important;
+	}
+    .container-banner{
+        width: 100%;
+        height: 1142rpx;
+        background: url(https://admin.caimei365.com/userfiles/1/images/photo/2024/08/ziluo_bg.jpg) no-repeat;
+        background-size: contain;
+        box-sizing: border-box;
+        padding: 0 150rpx;
+        .login-input{
+        	width: 100%;
+        	height: 88rpx;
+        	padding:0 24rpx;
+        	margin: 0 auto;
+        	margin-bottom: 60rpx;
+        	background: #FFFFFF;
+            box-sizing: border-box;
+            border-radius: 50rpx;
+        	.input{
+        		width: 100%;
+        		height: 100%;
+        		background: #FFFFFF;
+        		font-size: $font-size-28;
+        		line-height: 88rpx;
+        		color: #333333;
+                 border-radius: 50rpx;
+        	}
+        }
+        .login-btn {
+        	width: 100%;
+        	height: 88rpx;
+        	font-size: $font-size-28;
+        	line-height: 88rpx;
+        	color: #ffffff;
+        	margin: 0 auto;
+        	margin-bottom: 24rpx;
+        	text-align: center;
+        	background-color: #e10078;
+        	border-radius: 50rpx;
+        }
+    }
+	
+</style>

pages/seller/club/club-list.vue

@@ -7,11 +7,8 @@
                 <view class="search-from name">
                     <text class="iconfont icon-iconfonticonfontsousuo1"></text>
                     <input class="input" type="text" confirm-type="search" v-model="listQuery.name" @input="onShowClose"
-                        @confirm="GetSellerClubList()" placeholder="机构名称/联系人" maxlength="12" />
-                    <text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-                </view>
-                <view class="search-btn">
-                    <button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
+                        @confirm="searchClubList" placeholder="机构名称/联系人" maxlength="12" />
+                    <text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText"></text>
                 </view>
             </view>
             <view class="club-main">
@@ -22,7 +19,7 @@
                     <view class="txt">暂无机构数据</view>
                 </view> 
                 <view v-else class="club-list">
-                    <scroll-view scroll-y="true">
+                    <scroll-view scroll-y="true" class="club-list-main">
                         <view class="list" v-for="(club, index) in clubList" :key="index">
                             <view class="club-list-top">
                                 <view class="list-left">
@@ -252,9 +249,10 @@
     }
 
     .club-search {
-        height: 64rpx;
-        width: 702rpx;
-        padding: 24rpx;
+        height: 84rpx;
+        width: 100%;
+        box-sizing: border-box;
+        padding:0 24rpx 20rpx 24rpx;
         background: #ffffff;
         display: flex;
         align-items: center;
@@ -264,7 +262,7 @@
         z-index: 999;
 
         .search-from {
-            width: 582rpx;
+            width: 100%;
             height: 64rpx;
             background: #f7f7f7;
             border-radius: 32rpx;
@@ -304,279 +302,267 @@
                 font-size: $font-size-24;
             }
         }
-
-        .search-btn {
-            width: 120rpx;
-            line-height: 64rpx;
-            text-align: center;
-            font-size: $font-size-28;
-            color: $color-system;
-            float: left;
-            background: #ffffff;
-        }
     }
 
     .club-main {
-        padding-top: 122rpx;
-
-        .list {
-            align-items: center;
-            width: 702rpx;
-            height: auto;
-            padding: 24rpx;
-            background: #ffffff;
-            position: relative;
-            border-bottom: 1px solid #ebebeb;
-            float: left;
-
-            .club-list-top {
+        padding-top: 100rpx;
+        .club-list{
+            width: 100%;
+            .club-list-main{
                 width: 100%;
-                height: 140rpx;
-                float: left;
-                display: flex;
-                align-items: center;
-
-                .list-left {
-                    height: 140rpx;
-                    flex: 2;
-                    margin-right: 10rpx;
-
-                    .list-head {
-                        width: 140rpx;
+                box-sizing: border-box;
+                padding: 0 24rpx;
+                .list {
+                    align-items: center;
+                    width: 100%;
+                    height: auto;
+                    padding: 20rpx;
+                    background: #ffffff;
+                    position: relative;
+                    float: left;
+                    margin-bottom: 20rpx;
+                    box-sizing: border-box;
+                    border-radius: 24rpx;
+                    .club-list-top {
+                        width: 100%;
                         height: 140rpx;
-                        border-radius: 14rpx;
-
-                        image {
-                            width: 140rpx;
+                        float: left;
+                        display: flex;
+                        align-items: center;
+                
+                        .list-left {
                             height: 140rpx;
-                            border-radius: 14rpx;
-                        }
-                    }
-                }
-
-                .list-item {
-                    height: 140rpx;
-                    flex: 8;
-                    display: flex;
-                    flex-direction: column;
-
-                    .list-title {
-                        flex: 2;
-                        line-height: 80rpx;
-                        width: 100%;
-                        font-size: $font-size-28;
-                        color: $text-color;
-                        padding-left: 11rpx;
-                        flex-direction: row;
-                        justify-content: flex-start;
-
-                        .list-name {
-                            min-width: 100rpx;
-                            display: block;
-                            float: left;
-                            text-align: left;
-                            -o-text-overflow: ellipsis;
-                            text-overflow: ellipsis;
-                            display: -webkit-box;
-                            word-break: break-all;
-                            -webkit-box-orient: vertical;
-                            -webkit-line-clamp: 1;
-                            overflow: hidden;
-                        }
-
-                        .tags {
-                            display: inline-block;
-                            height: 36rpx;
-                            padding: 0 15rpx;
-                            border-radius: 8rpx;
-                            background: #f0cb72;
-                            font-size: $font-size-22;
-                            color: #4e4539;
-                            text-align: center;
-                            line-height: 36rpx;
-                            margin-left: 10rpx;
+                            flex: 2;
                             margin-right: 10rpx;
-
-                            &.sv {
-                                background: #333333;
-                                color: #f0cb72;
+                
+                            .list-head {
+                                width: 140rpx;
+                                height: 140rpx;
+                                border-radius: 50%;
+                
+                                image {
+                                    width: 140rpx;
+                                    height: 140rpx;
+                                    border-radius: 50%;
+                                }
                             }
                         }
-
-                        .list-hist {
-                            display: block;
-                            float: right;
-                            color: #1890F9;
-                            font-size: $font-size-24;
-                            text-align: right;
-                            padding-right: 30rpx;
-
-                            .icon-dingdanxuanzhong {
-                                font-size: $font-size-34;
-                                color: #1890F9;
+                
+                        .list-item {
+                            height: 140rpx;
+                            flex: 8;
+                            display: flex;
+                            flex-direction: column;
+                
+                            .list-title {
+                                flex: 2;
+                                line-height: 80rpx;
+                                width: 100%;
+                                font-size: $font-size-28;
+                                color: $text-color;
+                                padding-left: 11rpx;
+                                flex-direction: row;
+                                justify-content: flex-start;
+                
+                                .list-name {
+                                    min-width: 100rpx;
+                                    display: block;
+                                    float: left;
+                                    text-align: left;
+                                    -o-text-overflow: ellipsis;
+                                    text-overflow: ellipsis;
+                                    display: -webkit-box;
+                                    word-break: break-all;
+                                    -webkit-box-orient: vertical;
+                                    -webkit-line-clamp: 1;
+                                    overflow: hidden;
+                                }
+                
+                                .tags {
+                                    display: inline-block;
+                                    height: 36rpx;
+                                    padding: 0 15rpx;
+                                    border-radius: 8rpx;
+                                    background: #f0cb72;
+                                    font-size: $font-size-22;
+                                    color: #4e4539;
+                                    text-align: center;
+                                    line-height: 36rpx;
+                                    margin-left: 10rpx;
+                                    margin-right: 10rpx;
+                
+                                    &.sv {
+                                        background: #333333;
+                                        color: #f0cb72;
+                                    }
+                                }
+                
+                                .list-hist {
+                                    display: block;
+                                    float: right;
+                                    color: #1890F9;
+                                    font-size: $font-size-24;
+                                    text-align: right;
+                                    padding-right: 30rpx;
+                
+                                    .icon-dingdanxuanzhong {
+                                        font-size: $font-size-34;
+                                        color: #1890F9;
+                                    }
+                                }
+                            }
+                
+                            .list-opea {
+                                width: 100%;
+                                display: flex;
+                                flex: 4;
+                                color: #166ce1;
+                                flex-direction: row;
+                                align-items: center;
+                
+                                .tags {
+                                    display: inline-block;
+                                    height: 36rpx;
+                                    padding: 0 15rpx;
+                                    border-radius: 8rpx;
+                                    background: #f0cb72;
+                                    font-size: $font-size-22;
+                                    color: #4e4539;
+                                    text-align: center;
+                                    line-height: 36rpx;
+                                    margin-left: 10rpx;
+                                    margin-right: 10rpx;
+                
+                                    &.sv {
+                                        background: #333333;
+                                        color: #f0cb72;
+                                    }
+                
+                                    &.sm {
+                                        display: inline-block;
+                                        height: 36rpx;
+                                        box-sizing: border-box;
+                                        padding: 0 8rpx 0 15rpx;
+                                        border-radius: 8rpx;
+                                        background: #faede5;
+                                        font-size: $font-size-22;
+                                        color: $color-system;
+                                        text-align: center;
+                                        line-height: 36rpx;
+                                        margin-right: 10rpx;
+                
+                                        .icon-xiayibu {
+                                            font-size: 20rpx;
+                                            margin-left: 10rpx;
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
-
-                    .list-opea {
+                
+                    .club-list-bot {
                         width: 100%;
-                        display: flex;
-                        flex: 4;
-                        color: #166ce1;
-                        flex-direction: row;
-                        align-items: center;
-
-                        .tags {
-                            display: inline-block;
-                            height: 36rpx;
-                            padding: 0 15rpx;
-                            border-radius: 8rpx;
-                            background: #f0cb72;
-                            font-size: $font-size-22;
-                            color: #4e4539;
+                        height: 80rpx;
+                        float: left;
+                        border-radius: 8rpx;
+                        margin-top: 20rpx;
+                
+                        .btn {
+                            height: 80rpx;
+                            box-sizing: border-box;
+                            line-height: 80rpx;
+                            padding: 0 28rpx;
+                            font-size: $font-size-24;
+                            background-color: #F1F1F1;
+                            color: #333333; 
                             text-align: center;
-                            line-height: 36rpx;
-                            margin-left: 10rpx;
-                            margin-right: 10rpx;
-
-                            &.sv {
-                                background: #333333;
-                                color: #f0cb72;
-                            }
-
-                            &.sm {
-                                display: inline-block;
-                                height: 36rpx;
-                                box-sizing: border-box;
-                                padding: 0 8rpx 0 15rpx;
-                                border-radius: 8rpx;
-                                background: #faede5;
-                                font-size: $font-size-22;
-                                color: $color-system;
-                                text-align: center;
-                                line-height: 36rpx;
-                                margin-right: 10rpx;
-
-                                .icon-xiayibu {
-                                    font-size: 20rpx;
-                                    margin-left: 10rpx;
+                            float: right;
+                            position: relative;
+                            border-radius: 40rpx;
+                          
+                            &:nth-child(2) {
+                                &:before {
+                                    content: '';
+                                    width: 1px;
+                                    height: 20rpx;
+                                    background-color: #B2B2B2;
+                                    position: absolute;
+                                    right: 0;
+                                    top: 30rpx;
                                 }
                             }
-                        }
-                    }
-                }
-            }
-
-            .club-list-bot {
-                width: 100%;
-                height: 80rpx;
-                float: left;
-                background-color: #F7F7F7;
-                border-radius: 8rpx;
-                margin-top: 20rpx;
-
-                .btn {
-                    height: 80rpx;
-                    box-sizing: border-box;
-                    line-height: 80rpx;
-                    padding: 0 28rpx;
-                    font-size: $font-size-24;
-                    color: #333333;
-                    text-align: center;
-                    float: left;
-                    position: relative;
-
-                    // &:nth-child(1){
-                    // 	&:before{
-                    // 		content: '';
-                    // 		width: 1px;
-                    // 		height: 20rpx;
-                    // 		background-color: #B2B2B2;
-                    // 		position: absolute;
-                    // 		right: 0;
-                    // 		top: 30rpx;
-                    // 	}
-                    // }
-                    &:nth-child(2) {
-                        &:before {
-                            content: '';
-                            width: 1px;
-                            height: 20rpx;
-                            background-color: #B2B2B2;
-                            position: absolute;
-                            right: 0;
-                            top: 30rpx;
-                        }
-                    }
-
-                    &:nth-child(3) {
-                        &:before {
-                            content: '';
-                            width: 1px;
-                            height: 20rpx;
-                            background-color: #B2B2B2;
-                            position: absolute;
-                            right: 0;
-                            top: 30rpx;
-                        }
-                    }
-
-                    &:last-child {
-                        padding: 0 36rpx;
-
-                        .iconfont {
-                            font-weight: bold;
-                        }
-
-                        .btn-bubble {
-                            width: 200rpx;
-                            height: 160rpx;
-                            background: rgba(51, 51, 51, 0.8);
-                            position: absolute;
-                            top: -154rpx;
-                            right: 0;
-                            border-radius: 8rpx;
-
-                            &:before {
-                                content: '';
-                                width: 0;
-                                height: 0;
-                                border: 15rpx solid transparent;
-                                border-top: 15rpx solid rgba(51, 51, 51, 0.8);
-                                position: absolute;
-                                bottom: -28rpx;
-                                right: 42rpx;
+                
+                            &:nth-child(3) {
+                                &:before {
+                                    content: '';
+                                    width: 1px;
+                                    height: 20rpx;
+                                    background-color: #B2B2B2;
+                                    position: absolute;
+                                    right: 0;
+                                    top: 30rpx;
+                                }
                             }
-
-                            .btn-view {
-                                width: 100%;
-                                height: 80rpx;
-                                box-sizing: border-box;
-                                line-height: 80rpx;
-                                font-size: $font-size-24;
-                                color: #FFFFFF;
-                                text-align: center;
-                                float: left;
-
+                
+                            &:last-child {
+                                padding: 0 36rpx;
+                
                                 .iconfont {
-                                    font-size: 28rpx;
-                                    color: #FFFFFF;
-                                    margin-right: 5rpx;
-                                    font-weight: normal;
+                                    font-weight: bold;
                                 }
-
-                                &.border {
-                                    border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+                
+                                .btn-bubble {
+                                    width: 200rpx;
+                                    height: 160rpx;
+                                    background: rgba(51, 51, 51, 0.8);
+                                    position: absolute;
+                                    top: -154rpx;
+                                    right: 0;
+                                    border-radius: 8rpx;
+                
+                                    &:before {
+                                        content: '';
+                                        width: 0;
+                                        height: 0;
+                                        border: 15rpx solid transparent;
+                                        border-top: 15rpx solid rgba(51, 51, 51, 0.8);
+                                        position: absolute;
+                                        bottom: -28rpx;
+                                        right: 42rpx;
+                                    }
+                
+                                    .btn-view {
+                                        width: 100%;
+                                        height: 80rpx;
+                                        box-sizing: border-box;
+                                        line-height: 80rpx;
+                                        font-size: $font-size-24;
+                                        color: #FFFFFF;
+                                        text-align: center;
+                                        float: left;
+                
+                                        .iconfont {
+                                            font-size: 28rpx;
+                                            color: #FFFFFF;
+                                            margin-right: 5rpx;
+                                            font-weight: normal;
+                                        }
+                
+                                        &.border {
+                                            border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+                                        }
+                                    }
                                 }
                             }
+                
+                            .iconfont {
+                                font-size: 30rpx;
+                                color: #333333;
+                                margin-right: 5rpx;
+                            }
                         }
                     }
-
-                    .iconfont {
-                        font-size: 30rpx;
-                        color: #333333;
-                        margin-right: 5rpx;
-                    }
                 }
             }
         }

pages/seller/components/user.vue

@@ -3,21 +3,17 @@
         <cm-custom :navbar-data="nvabarData" />
         <view class="user-section">
             <view class="header" :style="{
-					height: CustomBar + 90 - StatusBar + 'px',
-					paddingTop: CustomBar + 'px',
+					height: CustomBar + 130 - StatusBar + 'px',
+					paddingTop: CustomBar-20 + 'px',
 					background: 'url(' + bgImgUrl + ')',
 					backgroundSize: 'cover'
 				}">
                 <view class="header-main" v-if="hasLogin">
-                    <view class="header-icon" @click="TestZHIboFn()">
+                    <view class="header-user">
                         <image src="https://static.caimei365.com/app/img/icon/default-head-new.png" mode=""></image>
+                        <view class="user-tips">协销人员</view>
                     </view>
-                    <view class="header-text">
-                        <view class="user-item">
-                            <text class="u-h1">{{ name }}</text>
-                        </view>
-                        <view class="user-item"> <text class="u-tips">协销人员</text> </view>
-                    </view>
+                   <view class="user-h1">{{ name }}</view>
                 </view>
                 <!-- 订单 -->
                 <view class="user-order">
@@ -124,7 +120,7 @@
                     //顶部自定义导航
                     showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
                     showSearch: 0,
-                    title: '账户中心', // 导航栏 中间的标题
+                    title: '', // 导航栏 中间的标题
                     haveBack: false,
                     textLeft: this.$store.state.isIphone,
                     textColor: '#FFFFFF',
@@ -132,7 +128,7 @@
                 },
                 CustomBar: this.CustomBar, // 顶部导航栏高度
                 StatusBar: this.StatusBar,
-                bgImgUrl: 'https://static.caimei365.com/app/img/bg/new_home_cumres@2x.png',
+                bgImgUrl: 'https://static.caimei365.com/app/img/bg/new_seller_cumres@2x.png',
                 name: '',
                 headpic: '',
                 userId: '',
@@ -264,21 +260,6 @@
                     this.orderNum = this.showBadge(data.uncheckedOrderCount) //未查看订单数量
                 })
             },
-            TestZHIboFn() {
-                //测试跳转直播小程序
-                // uni.navigateToMiniProgram({
-                // 	appId: 'wx92d650b253f8f2e3',
-                // 	path: '/pages/index/index',
-                // 	extraData: {
-                // 		'data1': 'test'
-                // 	},
-                // 	envVersion: 'develop',
-                // 	success(res) {
-                // 		// 打开成功
-                // 		console.log(res)
-                // 	}
-                // })
-            },
             navigator(url) {
                 this.$api.navigateTo(url)
             },
@@ -316,168 +297,58 @@
         position: relative;
         background-size: cover;
     }
-
     .header-main {
-        width: 702rpx;
-        height: 130rpx;
-        padding: 12rpx 24rpx;
+        width: 100%;
+        height: auto;
+        box-sizing: border-box;
         display: flex;
-
-        .header-text {
-            flex: 8;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+        .header-user{
+            width: 100rpx;
             display: flex;
+            justify-content: center;
             flex-direction: column;
-
-            .user-item {
-                flex: 1;
-                height: 64rpx;
-                line-height: 64rpx;
-
-                .u-tips {
-                    display: inline-block;
-                    float: left;
-                    width: 98rpx;
-                    height: 30rpx;
-                    border: 1px solid #ffffff;
-                    background: #ffffff;
-                    border-radius: 16rpx;
-                    line-height: 30rpx;
-                    font-size: $font-size-20;
-                    text-align: center;
-                    color: #999;
-                }
-
-                .u-viptips {
-                    display: inline-block;
-                    float: left;
-                    width: 98rpx;
-                    height: 30rpx;
-                    border: 1px solid #ffe600;
-                    background: linear-gradient(128deg, rgba(242, 143, 49, 1) 0%, rgba(225, 86, 22, 1) 100%);
-                    border-radius: 16rpx;
-                    line-height: 30rpx;
-                    font-size: $font-size-20;
-                    text-align: center;
-                    color: #ffe600;
-                    margin-left: 10rpx;
-                    margin-top: 17rpx;
-                }
-
-                .u-h1 {
-                    float: left;
-                    font-size: $font-size-30;
-                    color: #ffffff;
-                    text-align: left;
-                    -o-text-overflow: ellipsis;
-                    text-overflow: ellipsis;
-                    display: -webkit-box;
-                    word-break: break-all;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 1;
-                    overflow: hidden;
-                }
-
-                .u-p {
-                    font-size: $font-size-24;
-                    line-height: 64rpx;
-                    color: #ffffff;
-                    text-align: left;
-                }
-            }
-        }
-
-        .header-icon {
-            flex: 2;
-            margin-right: 20rpx;
-
+            align-items: center;
+            position: relative;
             image {
-                float: right;
-                width: 128rpx;
-                height: 128rpx;
-                border-radius: 100%;
-                border: 2rpx solid #ffffff;
+                width: 120rpx;
+                height: 120rpx;
+                border-radius: 50%;
+                display: block;
+                position: relative;
             }
-        }
-    }
-
-    .header-main-none {
-        width: 702rpx;
-        height: 152rpx;
-        padding: 0 24rpx;
-        display: flex;
-
-        .header-text {
-            flex: 8;
-            display: flex;
-            flex-direction: column;
-
-            .user-item {
-                flex: 1;
-                height: 50rpx;
-                line-height: 50rpx;
-
-                .line {
-                    margin: 0 10rpx;
-                }
-
-                .u-h1 {
-                    float: left;
-                    font-size: $font-size-36;
-                    color: #ffffff;
-                    text-align: left;
-                    -o-text-overflow: ellipsis;
-                    text-overflow: ellipsis;
-                    display: -webkit-box;
-                    word-break: break-all;
-                    -webkit-box-orient: vertical;
-                    -webkit-line-clamp: 1;
-                    overflow: hidden;
-                }
-
-                .u-p {
-                    font-size: $font-size-24;
-                    line-height: 50rpx;
-                    color: #efefef;
-                    text-align: left;
-                }
-
-                .u-btn {
-                    width: 160rpx;
-                    height: 40rpx;
-                    background: rgba(255, 255, 255, 0.5);
-                    border-radius: 5rpx;
-                    line-height: 40rpx;
-                    text-align: center;
-                    font-size: $font-size-24;
-                    color: #ffffff;
-                    display: block;
-                    margin-top: 5rpx;
-                    padding-left: 6rpx;
-
-                    .icon-xiangyouhuabeifen {
-                        font-size: $font-size-24;
-                    }
-                }
+            .user-tips{
+                width: 100rpx;
+                height: 30rpx;
+                border: 1px solid #ffffff;
+                background: #ffffff;
+                border-radius: 16rpx;
+                line-height: 30rpx;
+                font-size: $font-size-20;
+                text-align: center;
+                color: #999;
+                position: absolute;
+                bottom: -20rpx;
+                left: 0;
+                z-index: 999;
             }
         }
-
-        .header-icon {
-            flex: 2;
-            display: flex;
-            margin-right: 20rpx;
-            align-items: center;
-            justify-content: center;
-
-            image {
-                float: right;
-                width: 128rpx;
-                height: 128rpx;
-                border-radius: 100%;
-                border: 2rpx solid #ffffff;
-            }
+        .user-h1 {
+            font-size: $font-size-30;
+            color: #ffffff;
+            text-align: center;
+            -o-text-overflow: ellipsis;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            word-break: break-all;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 1;
+            overflow: hidden;
+            margin: 30rpx 0 0 0;
         }
     }
-
     .user-order {
         width: 654rpx;
         height: auto;
@@ -485,7 +356,7 @@
         background-color: $bg-color;
         margin-bottom: 24rpx;
         position: absolute;
-        bottom: -170rpx;
+        bottom: -160rpx;
         left: 24rpx;
         border-radius: 20rpx;
     }
@@ -576,7 +447,7 @@
         width: 100%;
         box-sizing: border-box;
         padding: 0 24rpx;
-        padding-top: 168rpx;
+        padding-top: 160rpx;
         padding-bottom: 120rpx;
     }
 

pages/service/certificate-page.vue

@@ -5,7 +5,6 @@
     		<view class="copyright-line"></view>
     		<view class="copyright-image">
     			<image class="image" :src="staticUrl + '/icon/icon-logo@1x.png'"></image>
-    			<view class="text">资质证书</view>
     		</view>
     	</view>
     	<view class="copyright-cell">
@@ -53,7 +52,7 @@ page{
 		width: 100%;
 		height: 56rpx;
 		box-sizing: border-box;
-		padding: 0 140rpx;
+		padding: 0 230rpx;
 		position: relative;
         margin-bottom: 30rpx;
 		.copyright-line{
@@ -64,15 +63,15 @@ page{
 		}
 		.copyright-image{
 			position: absolute;
-			width: 215rpx;
+			width: 70rpx;
 			left: 50%;
 			top:-22rpx;
-			margin-left: -130rpx;
+			margin-left: -65rpx;
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			background-color: #f7f7f7;
-			padding: 0 20rpx;
+			padding: 0 30rpx;
 			.image {
 				width: 70rpx;
 				height: 68rpx;

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com' 
-    URL_CONFIG = 'https://core.caimei365.com'    
+    URL_CONFIG = 'https://core-b.caimei365.com' 
+    // URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'