no message

components/page-component/app-user-center-top/app-user-center-top.vue

@@ -159,7 +159,7 @@
 							<view v-if="userInfo" class="t-omit">{{userInfo.identity.level_name}}</view>
 						</view>
 						<view class="" v-if="userInfo.identity.member_level>0" style="font-size: 22rpx;color: #fff;">
-							到期时间：{{userInfo.user_level_date.end_date}}天
+							会员剩余天数：{{userInfo.user_level_date.end_date}}天
 						</view>
 					</app-form-id>
 				</template>

pages/cart/cart.vue

@@ -20,18 +20,21 @@
 				<app-empty-bottom backgroundColor="#f7f7f7" :botBool="botBool" :height="Number(100)"></app-empty-bottom>
 			</view>
 			<view v-if="!tabbarbool" :style="{background: 'white', position: 'fixed', bottom: 0, height: `${getEmpty}rpx`, width: '750rpx'}"></view>
-			<view class="app-settlement dir-left-nowrap main-between cross-center" :style="{bottom:  `${tabbarbool ? BotHeight+18 : getEmpty}rpx`}">
-				<view class="app-radio dir-left-nowrap main-right cross-center">
-					<app-radio type="round" :theme="getTheme" @click="setALl" v-model="all"></app-radio>
-					<text class="app-all-text">全选</text>
-					<text class="app-price" v-if="!editStatus" :class="getTheme + '-m-text ' + getTheme">总计: ￥{{priceNum}}</text>
+			<view class="safe-area-inset-bottom bd-fixed-bottom">
+				<view class="app-settlement dir-left-nowrap main-between cross-center" :style="{bottom:  `${tabbarbool ? BotHeight : getEmpty}rpx`}">
+					<view class="app-radio dir-left-nowrap main-right cross-center">
+						<app-radio type="round" :theme="getTheme" @click="setALl" v-model="all"></app-radio>
+						<text class="app-all-text">全选</text>
+						<text class="app-price" v-if="!editStatus" :class="getTheme + '-m-text ' + getTheme">总计: ￥{{priceNum}}</text>
+					</view>
+					<button :disabled="submitDis" :class="submitDis ?  'delete-disabled' : getTheme + '-m-text ' + getTheme"  class="app-delete" v-if="editStatus" @click="deleteProduct">
+							删除
+					</button>
+					<button :disabled="submitDis" :class="submitDis ? 'disabled-background' : getTheme + '-m-back ' + getTheme" class="app-settlement-button" v-else @click="settlement">
+							去结算
+					</button>
 				</view>
-				<button :disabled="submitDis" :class="submitDis ?  'delete-disabled' : getTheme + '-m-text ' + getTheme"  class="app-delete" v-if="editStatus" @click="deleteProduct">
-						删除
-				</button>
-				<button :disabled="submitDis" :class="submitDis ? 'disabled-background' : getTheme + '-m-back ' + getTheme" class="app-settlement-button" v-else @click="settlement">
-						去结算
-				</button>
+				 <view v-if="tabbarbool" class="bd-bottom-height-0"></view>
 			</view>
 		</view>
 	</app-layout>
@@ -737,6 +740,22 @@
 </script>
 
 <style lang="scss" scoped>
+	.bd-fixed-bottom {
+	    width: 100%;
+	    z-index: 1500;
+	    position: fixed;
+	    left: 0;
+	    bottom: 0;
+	}
+	.safe-area-inset-bottom {
+	  padding-bottom: 0;
+	  padding-bottom: constant(safe-area-inset-bottom);
+	  padding-bottom: env(safe-area-inset-bottom);
+	}
+	.bd-bottom-height-0 {
+	    width:100%;
+	    height: 110upx;
+	}
 	.app-cart {
 		background-color: #f7f7f7;
 		position: absolute;
@@ -760,12 +779,10 @@
 		}
 		.app-settlement {
 			width: 100%;
-			height: #{100rpx};
-			z-index: 1500;
-			position: fixed;
-			left: 0;
+			height: #{110rpx};
 			border-top: #{1rpx} solid #e2e2e2;
 			background-color: white;
+	        padding: 15upx 24upx;
 			.app-radio {
 				padding-left: #{23rpx};
 				.app-price {
@@ -795,21 +812,17 @@
 				border: #{1rpx} solid #989898;
 			}
 			.app-settlement-button {
-				height: #{100rpx};
+				height: #{82rpx};
 				width: #{250rpx};
 				color: #ffffff;
 				font-size: #{30rpx};
-				line-height: #{100rpx};
+				line-height: #{82rpx};
 				text-align: center;
-				border-radius: 0;
 				margin: 0;
 				padding: 0;
+	            border-radius: 41upx;
 				border: none;
 			}
-			
-			.disabled-background {
-				background-color: #989898;
-			}
 		}
 		.no-cart {
 			width: 100%;
@@ -833,4 +846,106 @@
 			}
 		}
 	}
+	.send-dialog {
+	    position: fixed;
+	    top: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 100%;
+	    background-color: rgba(0,0,0,.3);
+	    z-index: 1700;
+	    .send-content {
+	        position: absolute;
+	        bottom: 0;
+	        left: 0;
+	        background-color: #fff;
+	        border-top-left-radius: 16rpx;
+	        border-top-right-radius: 16rpx;
+	        padding: 24rpx;
+	        .send-close {
+	            position: absolute;
+	            top: 24rpx;
+	            right: 24rpx;
+	            width: 30rpx;
+	            height: 30rpx;
+	        }
+	        .send-title {
+	            font-size: 32rpx;
+	            margin: 16rpx 0 36rpx;
+	            text-align: center;
+	            color: #000000;
+	        }
+	        .send-tip {
+	            font-size: 24rpx;
+	            color: #999999;
+	        }
+	        .send-type {
+	            margin-top: 32rpx;
+	            .send-type-name {
+	                height: 42rpx;
+	                font-size: 28rpx;
+	                color: #353535;
+	                image {
+	                    width: 42rpx;
+	                    height: 42rpx;
+	                    margin-right: 18rpx;
+	                }
+	            }
+	            .send-type-item {
+	                margin-top: 15rpx;
+	                height: 226rpx;
+	                border-radius: 16rpx;
+	                background-color: #f2f2f2;
+	                padding: 20rpx;
+	                padding-left: 0;
+	                padding-bottom: 0;
+	                width: 702rpx;
+	                position: relative;
+	                .send-goods {
+	                    white-space: nowrap;
+	                    .send-goods-list {
+	                        white-space: nowrap;
+	                        margin-left: 0;
+	                    }
+	                    view {
+	                        height: 110rpx;
+	                        margin-left: 20rpx;
+	                        display: inline-block;
+	                        image {
+	                            width: 110rpx;
+	                            height: 110rpx;
+	                            border-radius: 16rpx;
+	                        }
+	                    }
+	                }
+	                .send-count {
+	                    height: 96rpx;
+	                    line-height: 96rpx;
+	                    width: 500rpx;
+	                    font-size: 22rpx;
+	                    color: #353535;
+	                    position: absolute;
+	                    bottom: 0;
+	                    left: 30rpx;
+	                    text {
+	                        color: #ff4544;
+	                    }
+	                }
+	                .send-count-btn {
+	                    position: absolute;
+	                    bottom: 22rpx;
+	                    right: 28rpx;
+	                    height: 54rpx;
+	                    border-radius: 27rpx;
+	                    width: 128rpx;
+	                    text-align: center;
+	                    line-height: 54rpx;
+	                    background-color: #ff4544;
+	                    color: #fff;
+	                    font-size: 28rpx;
+	                }
+	            }
+	        }
+	    }
+	}
 </style>

pages/member/index/index.vue

@@ -15,7 +15,7 @@
 		                    <text v-if="level == 0">{{userInfo.identity.level_name}}</text>
 		                    <text v-if="level > 0" class="t-omit member-level-name">{{detail.name}}</text>
 		                </view>
-						<text v-if="level > 0" style="margin-left: 15rpx;" class="t-omit">到期时间：{{userInfo.user_level_date.end_date}}天</text>
+						<text v-if="level > 0" style="margin-left: 15rpx;" class="t-omit">会员剩余天数：{{userInfo.user_level_date.end_date}}天</text>
 		                <view class="progress" v-if="nextMember.money > 0">
 		                	<view class="progress-line">
 		                		<view :style="[{'width': prop + `%`}]" class="progress-active"></view>
@@ -73,12 +73,12 @@
 		                <image load-lazy="true" class="memeber-img" :src="item.bg_pic_url ? item.bg_pic_url : item.pic_url"></image>
 		                <view class="memeber-other">
 		                    <view class="member-name t-omit">{{item.name}}</view>
-		                    <view class="discount">
+		                   <!-- <view class="discount">
 		                        <text>{{item.discount}}</text>折
 		                    </view>
-		                    <view>会员折扣</view>
+		                    <view>会员折扣</view> -->
 		                    <view @click="toMore(item.level)">
-		                        <button class="update-btn">立即升级</button>
+		                        <button class="update-btn">{{item.level == userInfo.identity.member_level?'立即续费':'立即升级' }}</button>
 		                    </view>
 		                </view>
 		            </view>
@@ -88,12 +88,12 @@
 		            <image load-lazy="true" class="level-img" :src="nextList[0].bg_pic_url ? nextList[0].bg_pic_url : nextList[0].pic_url "></image>
 		            <view class="level-right">
 		                <view class="level-name t-omit">{{ nextList[0].name }}</view>
-		                会员折扣
+		                <!-- 会员折扣
 		                <text class="discount">
 		                    <text>{{nextList[0].discount}}</text>折
-		                </text>
+		                </text> -->
 		                <view @click="toMore(nextList[0].level)">
-		                    <button class="level-btn">立即升级</button>
+		                    <button class="level-btn">{{nextList[0].level == userInfo.identity.member_level?'立即续费':'立即升级' }}</button>
 		                </view>
 		            </view>
 		        </view>
@@ -303,6 +303,7 @@
 		                that.nextMember = that.list.next_consume_upgrade_member;
 		                that.member_pic_url = that.list.member_pic_url;
 		                that.nextList = that.list.next_mall_member;
+						console.log(this.nextList,"===============")
 		                if (that.recharge) {
 		                    that.balance = that.list.user_info.balance
 		                }
@@ -669,6 +670,9 @@
 	    border-top: 0;
 	    border-bottom-left-radius: #{16rpx};
 	    border-bottom-right-radius: #{16rpx};
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
 	}
 
 	.memeber-img {
@@ -682,7 +686,8 @@
 	.member-name {
 	    color: #353535;
 	    font-size: #{32rpx};
-	    width: 90%;
+	    width: 100%;
+		text-align: center;
 	}
 
 	.member-price {
@@ -873,6 +878,10 @@
 	    padding: #{20rpx} 0;
 	    border-top-right-radius: #{16rpx};
 	    border-bottom-right-radius: #{16rpx};
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.level-right .discount {

pages/share/index/index.vue

@@ -87,7 +87,7 @@
                 <!-- 团队分红 -->
                 <view v-if="setting && setting.is_bonus == 1" class="list-item">
                     <view @click="jump('/plugins/bonus/index/index')">
-                        <image src="./../image/img-bonus-price.png"></image>
+                        <image src="/static/image/img-bonus-price.png"></image>
                         <view>{{setting.form.entry_bonus?setting.form.entry_bonus:"团队分红"}}</view>
                     </view>
                 </view>

siteinfo.js

@@ -1,9 +1,9 @@
 var siteinfo = {
     'acid': -1,
     'version': '4.3.57',
-	'siteroot': 'https://t12.9026.com/app/index.php',
-	'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
-    // 'siteroot': 'https://quanyouhui.9026.com/app/index.php',
-    // 'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
+	// 'siteroot': 'https://t12.9026.com/app/index.php',
+	// 'apiroot': 'https://t12.9026.com/web/index.php?_mall_id=21989',
+    'siteroot': 'https://quanyouhui.9026.com/app/index.php',
+    'apiroot': 'https://quanyouhui.9026.com/web/index.php?_mall_id=21989',
 };
 module.exports = siteinfo;