Merge branch 'main' of https://git.yuzhankeji.cn/TmOct5/barter-app

apis/interfaces/goods.js

@@ -87,6 +87,21 @@ const managesGoodsCreate = (data) => {
 	})
 }
 
+// 发布产品类目
+const managesCategory = () => {
+	return request({
+		url: 'manages/goods/category'
+	})
+}
+
+// 发布产品类目类型配置
+const managesCreate = (data) => {
+	return request({
+		url: 'manages/goods/create',
+		data
+	})
+}
+
 export {
 	mall,
 	list,
@@ -97,5 +112,7 @@ export {
 	managesGoodsOnsale,
 	managesGoodsOffsale,
 	managesGoodsCreateBefore,
-	managesGoodsCreate
+	managesGoodsCreate,
+	managesCategory,
+	managesCreate
 }

components/store-staff/store-staff.vue

@@ -1,6 +1,25 @@
 <template>
 	<view class="staff">
-		员工
+        员工啦
+		<!-- 员工权限工具 -->
+        <!-- <view class="tool-flex store">
+        	<view class="store-item" @click="$Router.push({name: 'Verification'})">
+        		<image class="icon" src="@/static/icons/tool_icon_00.png" mode="aspectFill"></image>
+        		<view class="title">扫码验证</view>
+        	</view>
+        	<view class="store-item" @click="$Router.push({name: 'GoodsMag'})">
+        		<image class="icon" src="@/static/icons/tool_icon_01.png" mode="aspectFill"></image>
+        		<view class="title">商品权证</view>
+        	</view>
+        	<view class="store-item" @click="$Router.push({name: 'CouponsMag'})">
+        		<image class="icon" src="@/static/icons/tool_icon_02.png" mode="aspectFill"></image>
+        		<view class="title">优惠券管理</view>
+        	</view>
+        	<view class="store-item" @click="$Router.push({name: 'Collection'})">
+        		<image class="icon" src="@/static/icons/tool_icon_03.png" mode="aspectFill"></image>
+        		<view class="title">收款管理</view>
+        	</view>
+        </view> -->
 	</view>
 </template>
 

pages/goods/add.vue

@@ -3,12 +3,18 @@
 		<!-- 商品图片 -->
 		<view class="form-block">
 			<view class="form-upd">
-				<view class="form-title">商品轮播图<text>（首图为产品封面）</text></view>
+				<view class="form-title">商品轮播图<text>（首图封面图，点击预览，长按删除）</text></view>
 				<view class="form-imgs">
-					<view class="item" v-for="(item, index) in cover" :key="index">
+					<view
-						<image class="item-cover" src="@/static/dev/good_cover_00.jpg" mode="aspectFill"></image>
+						class="item"
+						v-for="(item, index) in pictures"
+						:key="index"
+						@click="openImg(index, 'pictures')"
+						@longpress="removeImg(index, 'pictures')"
+					>
+						<image class="item-cover" :src="item.showpath" mode="aspectFill"></image>
 					</view>
-					<view class="item item-add">
+					<view class="item item-add" @click="updCover('pictures')">
 						<image class="item-cover" src="@/static/icons/add-icon.png" mode="aspectFill"></image>
 					</view>
 				</view>
@@ -17,50 +23,56 @@
 		<!-- 商品基本信息 -->
 		<view class="form-block">
 			<view class="form-box inputs-flex">
-				<label class="form-label">标题</label>
+				<label class="form-label">产品标题</label>
 				<input type="text" v-model="name" placeholder="输入商品标题"/>
 			</view>
 			<view class="form-box inputs-flex">
 				<label class="form-label">商品描述</label>
 				<input type="text" v-model="description" placeholder="输入商品描述"/>
 			</view>
-			<view class="form-box picker-flex">
+			<view class="form-box inputs-flex">
-				<label class="form-label">产品详情</label>
+				<label class="form-label">规格单位</label>
-				<view class="picker-text">
+				<input type="digit" :value="skus_unit" placeholder="输入规格单位 如:件"/>
-					<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+			</view>
+			<view class="form-upd">
+				<view class="form-title">商品详情（点击预览，长按删除）</view>
+				<view class="form-imgs">
+					<view
+						class="item"
+						v-for="(item, index) in content"
+						:key="index"
+						@click="openImg(index, 'content')"
+						@longpress="removeImg(index, 'content')"
+					>
+						<image class="item-cover" :src="item.showpath" mode="aspectFill"></image>
+					</view>
+					<view class="item item-add" @click="updCover('content')">
+						<image class="item-cover" src="@/static/icons/add-icon.png" mode="aspectFill"></image>
+					</view>
 				</view>
 			</view>
 		</view>
 		<!-- 商品价格 -->
 		<view class="form-block">
-			<view class="form-box inputs-flex input-unit">
-				<label class="form-label">划线价</label>
-				<input type="digit" v-model="original_price" placeholder="0.00"/>
-				<text class="units">元/件</text>
-			</view>
 			<view class="form-box inputs-flex input-unit">
 				<label class="form-label">市场价格</label>
 				<input type="digit" v-model="skus_cost" placeholder="0.00"/>
-				<text class="units">元/件</text>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
 			</view>
 			<view class="form-box inputs-flex input-unit">
 				<label class="form-label">销售价格</label>
 				<input type="digit" v-model="skus_price" placeholder="0.00"/>
-				<text class="units">元/件</text>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
-			</view>
-			<view class="form-box inputs-flex input-unit">
-				<label class="form-label">资产</label>
-				<input type="digit" v-model="skus_assets" placeholder="0.00"/>
-				<text class="units">元/件</text>
 			</view>
 			<view class="form-box inputs-flex input-unit">
 				<label class="form-label">分销佣金</label>
 				<input type="digit" v-model="skus_charge" placeholder="0.00"/>
-				<text class="units">元/件</text>
+				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
 			</view>
 		</view>
 		<!-- 商品详情介绍 -->
 		<view class="form-block">
+			<!-- is_change	query	否	0	是否支持易货 -->
 			<view class="form-box inputs-flex">
 				<label class="form-label">易货起购数量</label>
 				<input type="number" v-model="skus_number" placeholder="输入易货起购数量"/>
@@ -73,39 +85,37 @@
 		<!-- 售后服务 -->
 		<view class="form-block">
 			<view class="form-box picker-flex">
-				<label class="form-label">分类</label>
+				<label class="form-label">配送方式</label>
-				<picker mode="selector">
+				<view class="picker-text">
-					<view class="picker-text">
+					logistic_type	1.快递，2.自提<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
-						请选择分类
+				</view>
-						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
-					</view>
-				</picker>
 			</view>
 			<view class="form-box picker-flex">
-				<label class="form-label">支付方式</label>
+				<label class="form-label">关联店铺</label>
-				<picker mode="selector">
+				<view class="picker-text">
-					<view class="picker-text">
+					stores 自提必填<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
-						请选择支付方式
+				</view>
-						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
-					</view>
-				</picker>
 			</view>
 			<view class="form-box picker-flex">
 				<label class="form-label">允许售后</label>
-				<picker mode="selector">
-					<view class="picker-text">
-						是
-						<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
-					</view>
-				</picker>
 			</view>
 			<view class="form-box picker-flex">
 				<label class="form-label">可选服务</label>
 				<view class="picker-text">
-					<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+					321321<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
 				</view>
 			</view>
 		</view>
+		<!-- 售后服务 -->
+		<view class="form-block">
+			<view class="form-box picker-flex">
+				<label class="form-label">到期时间</label>
+				<view class="picker-text">
+					321321<uni-icons class="picker-icon" type="arrowright" color="#999"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<!-- 可选服务 -->
 		<!-- 安全区 -->
 		<view class="ios-bottom"></view>
 		<!-- footer -->
@@ -117,25 +127,92 @@
 </template>
 
 <script>
-	import { managesGoodsCreate } from '@/apis/interfaces/goods'
+	import { managesGoodsCreate, managesCreate } from '@/apis/interfaces/goods'
 	import { uploads } from '@/apis/interfaces/uploading'
 	export default {
 		data() {
 			return {
-				cover			: [],
+				name		: '',	 // 标题
-				name			: '',
+				pictures	: [], 	 // 轮播图
-				description		: '',
+				content		: [], 	 // 详情图
-				original_price	: '',
+				description	: '', 	 // 商品描述
-				skus_cost		: '',
+				isPostSale	: false, // 是否允许售后
-				skus_price		: '',
+				services	: [],	 // 商品服务
-				skus_assets		: '',
+				skus_cost	: '0.00',// 市场价格
-				skus_charge		: '',
+				skus_price	: '0.00',// 销售价格
-				skus_number		: '',
+				skus_number	: 1,	 // 易货起购数量
-				skus_stock		: '',
+				skus_unit	: '件',	 // 规格文字
+				skus_charge	: '0.00',// 分销佣金
+				skus_stock	: 0,	 // 库存
+				isChange	: false, // 是否支持易货
+				logisticType: 0,	 // 配送方式
+				stores		: [],	 // 关联店铺
+				expiriedAt	: '',	 // 活动到期时间
+				// 配置信息
+				storesArr	: [],    // 可选店铺
+				tags		: [],	 // 可选商品标签
+				tagsIndex	: 0,	 // 选择标签的下标
+				servicesArr	: [],	 // 可选服务
+				type		: 1,	 // 1为商品，0为服务
 			};
 		},
+		created() {
+			managesCreate({
+				category_cid: 140
+			}).then(res => {
+				this.storesArr 	= res.stores
+				this.tags		= res.tags
+				this.servicesArr= res.services
+				this.type		= res.type
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
 		methods: {
-			
+			// 图片预览
+			openImg(index, key){
+				let paths = this[key].map(val => {
+					return val.showpath
+				})
+				uni.previewImage({
+					urls	 : paths,
+					current	 : index,
+					indicator: 'number'
+				})
+			},
+			// 删除图片
+			removeImg(index, key){
+				this[key].splice(index, 1)
+			},
+			// 上传图片
+			updCover(key){
+				uni.chooseImage({
+					success	: res => {
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri : val.path
+							}
+						})
+						uploads(path).then(updRes => {
+							for(let i in updRes.path){
+								this[key].push({
+									path	: updRes.path[i],
+									showpath: updRes.url[i]
+								})
+							}
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon : 'none'
+							})
+						})
+					}
+				})
+			}
 		}
 	}
 </script>

pages/goods/addClassify.vue

@@ -1,19 +1,100 @@
 <template>
-	<view>
+	<view class="content-flex" v-if="!loding">
-		发布分类
+		<scroll-view class="stair" scroll-y>
+			<view class="stair-item" :class="{'show': stairIndex == index}" v-for="(item, index) in category" :key="index" @click="stairIndex = index">{{item.name}}</view>
+			<view class="ios-bottom"></view>
+		</scroll-view>
+		<scroll-view class="second" scroll-y>
+			<view class="second-item" v-for="(item, index) in category[stairIndex].children" :key="index" @click="onCategory(item.category_id)">
+				{{item.name}}<uni-icons class="arrow-icon" type="arrowright" color="#999" size="14"></uni-icons>
+			</view>
+			<view class="ios-bottom"></view>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import { managesCategory } from '@/apis/interfaces/goods'
 	export default {
 		data() {
 			return {
-				
+				loding		: true,
+				category	: [],
+				stairIndex	: 0,
+				secondIndex : 0
 			};
+		},
+		created() {
+			managesCategory().then(res => {
+				this.loding   = false
+				this.category = res
+			})
+		},
+		methods:{
+			// 选择分类
+			onCategory(id){
+				this.$Router.push({name: 'GoodsMagAdd', params: {id}})
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
-
+	.content-flex{
+		background-color: white;
+		height: 100vh;
+		display: flex;
+		font-size: $title-size-m;
+		.stair{
+			background: #F5F5F5;
+			width: 240rpx;
+			.stair-item{
+				text-align: center;
+				padding: 0 $padding;
+				line-height: 90rpx;
+				color: $text-gray;
+				@extend .nowrap;
+				&.show{
+					position: relative;
+					background: white;
+					color: $text-price;
+					font-weight: bold;
+					&::before{
+						position: absolute;
+						height: 40rpx;
+						width: 5rpx;
+						background: $text-price;
+						content: " ";
+						left: 0;
+						top: 20rpx;
+					}
+				}
+			}
+		}
+		.second{
+			width: calc(100% - 240rpx);
+			.second-item{
+				position: relative;
+				padding: 0 ($padding + 80) 0 $padding;
+				line-height: 90rpx;
+				color: $text-gray;
+				.arrow-icon{
+					position: absolute;
+					right: $padding;
+				}
+				&::after{
+					position: absolute;
+					height: 1rpx;
+					content: ' ';
+					background: $border-color;
+					left: $padding;
+					right: 0;
+					top: 0;
+				}
+				&:first-child::after{
+					display: none;
+				}
+			}
+		}
+	}
 </style>

pages/goods/details.vue

@@ -17,7 +17,7 @@
                 	<view class="price"><text>￥</text>{{goodsObj.price.show}}</view>
                 	<view class="sales">累计易货{{goodsObj.sales}}次</view>
                 </view>
-                <view class="coupon">
+                <view class="coupon" v-if="couponSee.length > 0" @click="couponsOpne">
                     <view class="coupon-list" v-for="(item, index) in couponSee" :key="index">
                         <view class="coupon-label">
                             {{item.title}}
@@ -28,47 +28,54 @@
 				<view class="title"><view class="title-hot">热卖</view>{{goodsObj.name}}</view>
 				<!-- <view class="sub-title">{{goodsObj.description}}</view> -->
 			</view>
-			<!-- 商家信息 -->
+            <!-- 商家信息 -->
-			<view class="store">
+            <view class="store">
                 <image class="logo" :src="goodsObj.shop.cover" mode="aspectFill"></image>
-				<view class="store-cont">
+            	<view class="store-cont">
-				    <view class="title">{{goodsObj.shop.name}}</view>
+            	    <view class="store-title">{{goodsObj.shop.name}}</view>
-				    <view class="rate">
+            	    <view class="rate">
-				    	<uni-rate
+            	    	<uni-rate
-				    		:readonly="true"
+            	    		:readonly="true"
-				    		color="#ddd"
+            	    		color="#ddd"
-				    		active-color="#c82626"
+            	    		active-color="#c82626"
-				    		:value="2.5"
+            	    		:value="2.5"
-				    		:size="14"
+            	    		:size="14"
-				    	/>
+            	    	/>
-				    </view>
+            	    </view>
-                    <view class="openbtn" @click="onOpenWechat">进店</view>
+                    <view class="openbtn" @click="onOpenWechat">进店<image class="openbtn-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image></view>
-				</view>
+            	</view>
                 <view class="tooSee">
                     <view class="tooSee-label">
                         区块链证书
+                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
                     </view>
                     <view class="tooSee-label">
                         商品认证
+                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
                     </view>
                     <view class="tooSee-label">
                         商品溯源
+                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
                     </view>
                 </view>
-			</view>
+            </view>
 			<!-- 产品规格 -->
 			<view class="size">
 				<view class="size-item nowrap">
-					<label class="title">产品规格</label>
+					<label class="title">规格</label>
 					{{goodsObj.skus[0].goods_name}}
 				</view>
 				<view class="size-item nowrap">
-					<label class="title">限制</label>
+					<label class="title">说明</label>
 					特价商品不可与优惠券叠加使用
 				</view>
 				<view class="size-item nowrap">
 					<label class="title">服务</label>
-					易货严选自营･30天无忧退换･不可用券･国内部分地区不可配送
+                    <view class="goods-serve" @click="serveOpne">
+                        <image class="goods-serve-img" src="../../static/icons/goods_buy.png" mode="aspectFill"></image>
+                        <view class="nowrap goods-serve-name"><text v-for="(item, index) in goodsObj.services">{{item.name}}</text></view>
+                        <image class="goods-serve-img" src="../../static/icons/goods_spot.png" mode="aspectFill"></image>
+                    </view>
 				</view>
 			</view>
 			<!-- 产品详情 -->
@@ -82,6 +89,79 @@
 		<view class="footer">
 			<button class="btn" size="default" @click="buyGoods">立即购买</button>
 		</view>
+        
+        <!-- 优惠券弹出 -->
+        <uni-popup ref="couponsPopup">
+        	<view class="coupons-popup">
+        		<view class="coupons-header">
+        			<view class="title">优惠券</view>
+                    <image @click="couponsClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
+        		</view>
+                <view class="coupons-cont">
+                    <view class="coupons-name">
+                        可领取的优惠券
+                    </view>
+                    <view class="coupons-list" v-for="(item , index) in coupons" :key="index">
+                        <view class="coupons-tips" v-if="item.type">
+                            <!-- value == 1服务券    value == 2代金券   value == 3提货券 -->
+                            <text class="coupons-tips-text" v-if="item.type.value == '1'">服务券</text>
+                            <text class="coupons-tips-text" v-else-if="item.type.value == '2'">代金券</text>
+                            <text class="coupons-tips-text" v-else>提货券</text>
+                        </view>
+                        <view class="coupons-left" v-if="item.type.value == '2'">
+                            <view class="coupons-number">
+                                <text>￥</text>{{item.price}}
+                            </view>
+                            <view class="coupons-full">
+                                满{{item.full}}可用
+                            </view>
+                        </view>
+                        <view class="coupons-left" v-else-if="item.type.value == '3'">
+                            <view class="coupons-number coupons-small">
+                                提货券
+                            </view>
+                        </view>
+                        <view class="coupons-center">
+                            <view class="nowrap coupons-title">
+                                {{item.title}}
+                            </view>
+                            <view class="coupons-time" v-if="item.time">
+                                {{item.time.interval}}
+                            </view>
+                        </view>
+                        <view class="coupons-right">
+                            领取
+                        </view>
+                    </view>
+                </view>
+                <view class="coupons-true" @click="couponsClose">
+                    确定
+                </view>
+        	</view>
+        </uni-popup>
+        
+        <!-- 服务保障弹出 -->
+        <uni-popup ref="servePopup">
+        	<view class="coupons-popup">
+        		<view class="coupons-header">
+        			<view class="title">保障</view>
+                    <image @click="serveClose" class="close" src="../../static/icons/goods_close.png" mode=""></image>
+        		</view>
+                <view class="serve-cont">
+                    <view class="serve-label" v-for="(item, index) in goodsObj.services">
+                        <view class="serve-label-name">
+                            {{item.name}}
+                        </view>
+                        <view class="serve-label-text">
+                            {{item.content}}
+                        </view>
+                    </view>
+                </view>
+                <view class="coupons-true" @click="serveClose">
+                    确定
+                </view>
+        	</view>
+        </uni-popup>
 	</view>
 </template>
 
@@ -153,7 +233,27 @@
 						})
 					}
 				})
-			}
+			},
+            
+            // 选择优惠券-显示
+            couponsOpne(){
+            	this.$refs.couponsPopup.open('bottom')
+            },
+            
+            // 选择优惠券-隐藏
+            couponsClose(){
+            	this.$refs.couponsPopup.close()
+            },
+            
+            // 查看保障服务-显示
+            serveOpne(){
+            	this.$refs.servePopup.open('bottom')
+            },
+            
+            // 查看保障服务-隐藏
+            serveClose() {
+                this.$refs.servePopup.close()
+            }
 		}
 	}
 </script>
@@ -273,12 +373,33 @@
                 }
             }
 		}
+            
+        // 新增服务
+        .goods-serve {
+            display: flex;
+            .goods-serve-img {
+                width: 36rpx;
+                height: 36rpx;
+                margin-top: 24rpx;
+            }
+            .goods-serve-name {
+                margin: 0 30rpx 0 20rpx;
+                width: calc(100% - 122rpx);
+                text {
+                    padding-right: $padding;
+                    position: relative;
+                    &:last-child {
+                        padding-right: 0;
+                    }
+                }
+            }
+        }
+        
 		// 店铺
 		.store{
 			position: relative;
 			margin: 0 $margin;
-			// background: #F8F8F8;
+            background: #F8F8F8;
-            background: #999;
 			border-radius: $radius/2;
 			padding: $padding;
 			min-height: 160rpx;
@@ -311,8 +432,8 @@
                     background-color: #fd683e;
                     border-radius: 8rpx 4rpx 4rpx 6rpx;
                     color: #FFFFFF;
-                    height: 52rpx;
+                    height: 48rpx;
-                    line-height: 52rpx;
+                    line-height: 48rpx;
                     padding: 0 $padding - 15;
                     box-sizing: border-box;
                     display: inline-block;
@@ -351,25 +472,44 @@
                     &:first-child::before {
                         border-color: #fae2b9;
                     }
+                    .tooSee-label-img {
+                        position: absolute;
+                        right: -34rpx;
+                        top: 12rpx;
+                        width: 28rpx;
+                        height: 28rpx;
+                        z-index: 9;
+                    }
+                    &:first-child .tooSee-label-img {
+                        filter: brightness(.2)
+                    }
                 }
             }
-			.title{
+			.store-title{
 				font-size: $title-size-lg;
 				font-weight: bold;
 				line-height: 60rpx;
 				color: $text-color;
+                margin-bottom: 10rpx;
 			}
 			// rate
 			.openbtn{
 				position: absolute;
-				right: $margin;
+				right: $margin - 10;
-				top: $margin * 3;
+				top: $margin * 3.5;
 				color: #848484;
 				height: 60rpx;
 				line-height: 60rpx;
 				text-align: center;
 				font-size: $title-size-m;
 				margin-top: -30rpx;
+                display: flex;
+                .openbtn-img {
+                    width: 32rpx;
+                    height: 32rpx;
+                    filter: brightness(.5);
+                    margin-top: 14rpx;
+                }
 			}
 		}
 		// 产品规格
@@ -379,7 +519,7 @@
 			border-bottom: solid 20rpx #F8F8F8;
 			.size-item{
 				position: relative;
-				padding: 0 $padding 0 ($padding + 150);
+				padding: 0 $padding 0 ($padding + 100);
 				line-height: 90rpx;
 				font-size: $title-size-m;
 				&::after{
@@ -435,4 +575,126 @@
 			margin-bottom: calc(constant(safe-area-inset-bottom) / 2);
 		}
 	}
+    
+    // 优惠券弹出样式
+    .coupons-popup {
+        background-color: #FFFFFF;
+        border-radius: 40rpx 40rpx 0 0;
+        padding: $padding;
+        box-sizing: border-box;
+        .coupons-header {
+            text-align: center;
+            position: relative;
+            margin-bottom: $margin*1.5;
+            .title {
+                font-weight: 700;
+            }
+            .close {
+                position: absolute;
+                right: 0;
+                top: 0;
+                z-index: 2;
+                width: 38rpx;
+                height: 38rpx;
+            }
+        }
+        .coupons-cont {
+            .coupons-name {
+                color: #616065;
+                font-size: 30rpx;
+            }
+            .coupons-list {
+                border: 2rpx solid #d6b9be;
+                border-radius: 10rpx;
+                overflow: hidden;
+                position: relative;
+                margin-top: $margin;
+                .coupons-tips {
+                    background-color: #211e17;
+                    color: #efe8d8;
+                    position: absolute;
+                    border-radius: 0 0 20rpx 0;
+                    padding: 0 8rpx;
+                    height: 34rpx;
+                    line-height: 34rpx;
+                    left: 0;
+                    top: 0;
+                    .coupons-tips-text {
+                        font-size: 24rpx;
+                        transform:scale(.85);
+                        display: block;
+                    }
+                }
+                .coupons-left {
+                    background-color: #fdedee;
+                    color: #e1293f;
+                    width: 190rpx;
+                    text-align: center;
+                    padding: $padding - 10 0;
+                    border-right: 2rpx dashed #eccdd4;
+                    .coupons-number {
+                        font-size: 40rpx;
+                        font-weight: 600;
+                        text {
+                            font-size: 24rpx;
+                        }
+                        &.coupons-small {
+                            font-size: 32rpx;
+                            padding: 20rpx 0;
+                        }
+                    }
+                    .coupons-full {
+                        font-size: 24rpx;
+                    }
+                }
+                .coupons-center {
+                    position: absolute;
+                    width: 100%;
+                    left: 0;
+                    top: 0;
+                    padding: $padding - 10 130rpx 0 220rpx;
+                    box-sizing: border-box;
+                    font-size: 28rpx;
+                    .coupons-time {
+                        font-size: 24rpx;
+                        margin-top: 10rpx;
+                        color: #514c51;
+                    }
+                }
+                .coupons-right {
+                    position: absolute;
+                    right: 20rpx;
+                    top: 36rpx;
+                    width: 110rpx;
+                    text-align: center;
+                    background-color: #e1293f;
+                    color: #FFFFFF;
+                    border-radius: 80rpx;
+                    font-size: 24rpx;
+                    line-height: 52rpx;
+                }
+            }
+        }
+        .coupons-true {
+            background-image: linear-gradient(to right, #e1293f, #fd275d);
+            color: #FFFFFF;
+            border-radius: 80rpx;
+            line-height: 84rpx;
+            text-align: center;
+            margin-top: $margin*5;
+        }
+    }
+    
+    // 新增服务保障样式
+    .serve-label {
+        margin-top: $margin + 10;
+        font-size: 28rpx;
+        .serve-label-name {
+            font-weight: 700;
+            margin-bottom: $margin - 10;
+        }
+        .serve-label-text {
+            line-height: 44rpx;
+        }
+    }
 </style>

pages/login/login.vue

@@ -47,7 +47,6 @@
 					mobileNo: this.phone,
 					code	: this.code
 				}).then(res => {
-					console.log(res)
 					this.$store.commit('setToken', res.token_type + ' ' + res.access_token)
 					if(!res.is_company){
 						this.$Router.replace({name: "Registered"})

pages/property/index.vue

@@ -172,9 +172,9 @@
 			}
 		},
 		methods: {
-			// outLogin(){
+			outLogin(){
-			// 	this.$store.commit('setToken', '')
+				this.$store.commit('setToken', '')
-			// }
+			},
 			selectedBanner(item, index) {
 				console.log('🥒', item, index)
 			}

pages/store/index.vue

@@ -89,6 +89,7 @@
 					return
 				}
 				index().then(res => {
+					this.certification = res.is_certification
 					if(!res.is_certification){
 						this.getAppliesQuery()
 						return
@@ -104,10 +105,10 @@
 						middle	: res.middle,
 						order	: res.order
 					}
-					this.certification = res.is_certification
 					this.employee	   = res.is_employee
 					this.loding 	   = false
 				}).catch(err =>{
+					console.log(err)
 					uni.showToast({
 						title: err.message,
 						icon : 'none'
@@ -117,6 +118,7 @@
 			// 查询企业认证状态
 			getAppliesQuery(){
 				appliesQuery().then(res=>{
+					console.log(res)
 					this.appliesState = res
 					this.loding 	  = false
 				}).catch(err => {

pages/vip/index.vue

@@ -1,11 +1,30 @@
 <template>
-	<view class="content" v-if="!loding">
+     <!-- v-if="!loding" -->
+	<view class="content">
+        <swiper class="vip-container" previous-margin="45rpx" next-margin="45rpx" circular @change="swiperChange">
+        	<swiper-item class="vip-item">
+        		<view>
+        		    VIP企业会员
+        		</view>
+        	</swiper-item>
+            <swiper-item class="vip-item">
+            	<view>
+            	    普通会员
+            	</view>
+            </swiper-item>
+            <swiper-item class="vip-item">
+            	<view>
+            	    超级会员
+            	</view>
+            </swiper-item>
+        </swiper>
+        
 		<!-- 会员类型 -->
-		<view class="tabs">
+		<!-- <view class="tabs">
 			<view class="item" :class="{'show': index === tabsIndex}" v-for="(item, index) in identities" :key="index" @click="onTabs(index)">{{item.name}}</view>
-		</view>
+		</view> -->
 		<!-- 会员信息 -->
-		<view class="cards">
+		<!-- <view class="cards">
 			<view class="card">
 				<view class="card-content">
 					<image class="cover" src="@/static/dev/good_cover_01.png" mode="aspectFill"></image>
@@ -16,9 +35,9 @@
 			</view>
 			<view class="cards-back"></view>
 			<image class="cards-angle" src="@/static/imgs/vip-angle-back.png" mode="widthFix"></image>
-		</view>
+		</view> -->
 		<!-- 会员权限 -->
-		<view class="privilege">
+		<!-- <view class="privilege">
 			<view class="title">开通会员享特权</view>
 			<view class="privilege-box">
 				<view class="item" v-for="(item, index) in rights" :key="index" @click="showRemark(item.name, item.remark)">
@@ -26,18 +45,18 @@
 					<view class="text">{{item.name}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 会员 -->
-		<view class="footer">
+		<!-- <view class="footer">
 			<button class="footer-btn" type="default" @click="openOrder">￥{{identities[tabsIndex].price}}/年&nbsp;开通</button>
-		</view>
+		</view> -->
 		<!-- 会员服务信息 -->
-		<view class="notice">
+		<!-- <view class="notice">
 			<view class="title">开通须知</view>
 			<view class="item">
 				<text>{{description}}</text>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -55,18 +74,18 @@
 			}
 		},
 		created() {
-			identities().then(res => {
+			// identities().then(res => {
-				this.loding		= false
+			// 	this.loding		= false
-				this.user 		= res.user
+			// 	this.user 		= res.user
-				this.description= res.description
+			// 	this.description= res.description
-				this.identities = res.identities
+			// 	this.identities = res.identities
-				this.rights		= res.identities[0].rights
+			// 	this.rights		= res.identities[0].rights
-			}).catch(err =>{
+			// }).catch(err =>{
-				uni.showToast({
+			// 	uni.showToast({
-					title: err.message,
+			// 		title: err.message,
-					icon : 'none'
+			// 		icon : 'none'
-				})
+			// 	})
-			})
+			// })
 		},
 		methods: {
 			// 切换开通身份
@@ -141,6 +160,20 @@
 </script>
 
 <style lang="scss" scoped>
+    page {
+        background-color: #FFFFFF;
+    }
+    
+    // 新增样式
+    .vip-container {
+    	width: 750rpx;
+    	height: 350rpx;
+        .vip-item {
+            background-color: #c8c8c8;
+            border-radius: 20rpx;
+        }
+    }
+    
 	.content{
 		min-height: 100vh;
 		background: #fefaef;

unpackage/dist/dev/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CD19AAD","name":"易品新境","version":{"name":"1.0.0","code":"100"},"description":"易品新境为商家提供营销引流工具","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":false,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#f5f5f5"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"oauth":{"univerify":{},"weixin":{"appid":"wx222fbe58feee7819","appsecret":"3d24525a636d7573a8fae885097d5cf7","UniversalLinks":""}},"payment":{"weixin":{"__platform__":["android"],"appid":"wx222fbe58feee7819","UniversalLinks":""}},"share":{"weixin":{"appid":"wx222fbe58feee7819","UniversalLinks":""}},"maps":{},"ad":{},"geolocation":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"\",\"path\":\"\",\"query\":\"\",\"id\":0}","allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.2.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#bababa","selectedColor":"#e93340","backgroundColor":"#FFFFFF","borderStyle":"rgba(255,255,255,0.4)","list":[{"pagePath":"pages/equity/index","text":"通证权易","iconPath":"static/tabBar/tabBar_icon_00.png","selectedIconPath":"static/tabBar/tabBar_show_00.png"},{"pagePath":"pages/market/index","text":"转让市场","iconPath":"static/tabBar/tabBar_icon_01.png","selectedIconPath":"static/tabBar/tabBar_show_01.png"},{"pagePath":"pages/store/index","text":"企业工具","iconPath":"static/tabBar/tabBar_icon_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png"},{"pagePath":"pages/property/index","text":"我的资产","iconPath":"static/tabBar/tabBar_icon_03.png","selectedIconPath":"static/tabBar/tabBar_show_03.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CD19AAD","name":"易品新境","version":{"name":"1.0.0","code":"100"},"description":"易品新境为商家提供营销引流工具","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"OAuth":{},"Payment":{},"Share":{},"Geolocation":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":false,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#f5f5f5"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"safearea":{"bottom":{"offset":"none"}},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common"},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"oauth":{"univerify":{},"weixin":{"appid":"wx222fbe58feee7819","appsecret":"3d24525a636d7573a8fae885097d5cf7","UniversalLinks":""}},"payment":{"weixin":{"__platform__":["android"],"appid":"wx222fbe58feee7819","UniversalLinks":""}},"share":{"weixin":{"appid":"wx222fbe58feee7819","UniversalLinks":""}},"maps":{},"ad":{},"geolocation":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"arguments":"{\"name\":\"\",\"path\":\"\",\"query\":\"\",\"id\":0}","allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"3.1.18","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#bababa","selectedColor":"#e93340","backgroundColor":"#FFFFFF","borderStyle":"rgba(255,255,255,0.4)","list":[{"pagePath":"pages/equity/index","text":"通证权易","iconPath":"static/tabBar/tabBar_icon_00.png","selectedIconPath":"static/tabBar/tabBar_show_00.png"},{"pagePath":"pages/market/index","text":"转让市场","iconPath":"static/tabBar/tabBar_icon_01.png","selectedIconPath":"static/tabBar/tabBar_show_01.png"},{"pagePath":"pages/store/index","text":"企业工具","iconPath":"static/tabBar/tabBar_icon_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png"},{"pagePath":"pages/property/index","text":"我的资产","iconPath":"static/tabBar/tabBar_icon_03.png","selectedIconPath":"static/tabBar/tabBar_show_03.png"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}