merge

apis/interfaces/coupon.js

@@ -0,0 +1,83 @@
+/**
+ * Web-zdx
+ * moduleName: 优惠券相关
+ */
+
+import request from '../request.js'
+
+// 我的优惠券
+const myCoupon = (data) => {
+  return request({
+    url: 'coupons/user/coupons',
+    method: 'get',
+    data: data
+  })
+}
+
+// 优惠券分组列表
+const getCouponsListById = (id,data) => {
+  return request({
+    url: 'coupons/user/coupons/'+id+'/list',
+	data:data
+  })
+}
+
+// 根据优惠券id获取优惠券的详情信息
+const getCouponsInfoById = (id) => {
+  return request({
+    url: 'coupons/user/coupons/'+id,
+  })
+}
+
+
+// 根据企业id获取企业首页的轮播图列表
+const couponsByCompanyId = (data) => {
+  return request({
+    url: 'coupons',
+    method: 'get',
+    data: data
+  })
+}
+
+// 领取优惠券
+const couponsGrant = (id) => {
+  return request({
+    url: 'coupons/'+id+'/grant',
+    method: 'POST'
+  })
+}
+// 获取优惠券可使用商品
+const getGoodsByGrantId = (data) => {
+  return request({
+    url: 'user/coupons/goods',
+    data: data
+  })
+}
+
+// 使用提货券兑换商品
+const exchangeGoods = (data) => {
+  return request({
+    url: 'user/coupons/exchange',
+    method: 'POST',
+    data: data
+  })
+}
+
+// 获取核销二维码
+const getQrcodeByGrantId = (data) => {
+  return request({
+    url: 'coupons/user/coupons/qrcode',
+    data: data
+  })
+}
+
+export {
+  myCoupon,
+  couponsByCompanyId,
+  couponsGrant,
+  getGoodsByGrantId,
+  exchangeGoods,
+  getCouponsListById,
+  getCouponsInfoById,
+  getQrcodeByGrantId
+}

apis/interfaces/employees.js

@@ -55,11 +55,19 @@ const employeesPut = (id, data) => {
 	})
 }
 
+// 员工管理工具  手太欠
+const employeesTool = () => {
+	return request({
+		url: 'companies/employees/permission'
+	})
+}
+
 export {
 	employees,
 	employeesConfig,
 	addEmployees,
 	employeesInfo,
 	employeesDelete,
-	employeesPut
+	employeesPut,
+    employeesTool
 }

apis/interfaces/goods.js

@@ -126,6 +126,35 @@ const managesGoodsEdit = id => {
 	})
 }
 
+// 区块链证书
+const managesChain = (id) => {
+    return request({
+    	url: 'mall/goods/'+ id + '/chain'
+    })
+}
+
+// 商品认证
+const managesAttestation = (id) => {
+    return request({
+        url: 'mall/goods/'+ id +'/message'
+    })
+}
+
+// 商品溯源
+const managesTracedTo = (id) => {
+    return request({
+        url: 'mall/goods/'+ id +'/trace'
+    })
+}
+
+// 领取优惠券
+const managesCoupons = (id) => {
+    return request({
+        url: 'coupons/'+ id +'/grant',
+        method: 'POST'
+    })
+}
+
 export {
 	mall,
 	list,
@@ -138,8 +167,12 @@ export {
 	managesGoodsCreateBefore,
 	managesGoodsCreate,
 	managesCategory,
-	managesCreate,
 	managesGoodsAuth,
 	managesGoodsDelete,
-	managesGoodsEdit
+	managesGoodsEdit,
+	managesCreate,
+    managesChain,
+    managesAttestation,
+    managesTracedTo,
+    managesCoupons
 }

apis/interfaces/numberWeight.js

@@ -0,0 +1,140 @@
+/**
+ * Web-zdx
+ * moduleName: 我的数权
+ */
+
+import request from '../request.js'
+
+// 我的数权
+const mallWarrants = (data) => {
+  return request({
+    url: 'mall/warrants',
+    method: 'GET',
+    data: data
+  })
+}
+// 我的数权Id获取数权详情
+const mallWarrantsList = (symbol) => {
+  return request({
+    url: 'mall/warrants/exchange',
+    method: 'GET',
+    data: {
+		symbol:symbol
+	}
+  })
+ }
+// 确认提货
+const mallWarrantsSure = (data) => {
+  return request({
+    url: 'mall/warrants/exchange',
+    method: 'POST',
+    data: data
+  })
+}
+// 我的邮寄订单，我的提货单
+const mallShipmentsPostShop = (apiUrl,data) => {
+  return request({
+    url: apiUrl,
+    method: 'GET',
+    data: data
+  })
+}
+// 根据提货单的no 获取提货单的详情
+const mallShipmentsInfo = (no) => {
+  return request({
+    url: 'mall/shipments/'+no,
+    method: 'GET'
+  })
+}
+// 取消提货单
+const mallShipmentsCancel = (shipmentNo) => {
+  return request({
+    url: 'mall/shipments/'+ shipmentNo+'/cancel',
+    method: 'POST'
+  })
+}
+
+// 签收提货单
+const mallShipmentsSign = (shipmentNo) => {
+  return request({
+    url: 'mall/shipments/'+ shipmentNo+'/sign',
+    method: 'POST'
+  })
+}
+
+// 退货单申请退货
+const mallShipmentsRefund = (data) => {
+  return request({
+    url: 'mall/shipments/'+ data.shipment_no+'/refund',
+    method: 'POST',
+	data:data
+  })
+}
+
+// 退货单申请退货前置条件
+const mallShipmentsRefundInfo = (shipmentNo) => {
+  return request({
+    url: 'mall/shipments/'+ shipmentNo+'/refund',
+    method: 'GET'
+  })
+}
+
+// 查看物流接口
+const mallShipmentsLogistic = (shipmentNo) => {
+  return request({
+    url: 'mall/shipments/'+ shipmentNo+'/logistic',
+    method: 'GET'
+  })
+}
+
+// 我的退货单 mall/refunds
+const mallRefunds = (data) => {
+  return request({
+    url: 'mall/refunds',
+    method: 'GET',
+    data: data
+  })
+}
+
+//退货单详情页 
+const mallRefundsInfo = (no) => {
+  return request({
+    url: 'mall/refunds/'+no,
+    method: 'GET'
+  })
+}
+// 确认退货mall/refunds/{refund}/deliver
+const mallRefundsDeliver = (data) => {
+  return request({
+    url: 'mall/refunds/'+data.refund+'/deliver',
+    method: 'POST',
+	data:data
+  })
+}
+
+// 提货单或者服务单生成提货二维码
+const mallWarrantsQrcode = (data) => {
+  return request({
+    url: 'mall/warrants/qrcode',
+    method: 'GET',
+	data:data
+  })
+}
+
+
+export {
+  mallWarrants,
+  mallWarrantsList,
+  mallWarrantsSure,
+  mallShipmentsPostShop,
+  mallShipmentsInfo,
+  mallShipmentsCancel,
+  mallShipmentsSign,
+  mallShipmentsRefund,
+  mallShipmentsRefundInfo,
+  mallShipmentsLogistic,
+  mallRefunds,
+  mallRefundsInfo,
+  mallRefundsDeliver,
+  mallWarrantsQrcode
+}

components/goods-template/goods-template.vue

@@ -0,0 +1,173 @@
+<template>
+	<view class="GoodTemplate">
+		<view class="goods-item">
+			<image class="goods-img" @click="goDetail(item.goods_id)" hover-class="none" :src="item.cover"
+				mode="aspectFill" />
+			<view class="goods-info" @click="goDetail(item.goods_id)">
+				<view class="goods-title ellipsis-2">{{item.name}}</view>
+				<view class="goods-price">
+					<span>￥</span>{{item.price.price_min}}/权证 
+					<span style='color: #ffaa00;'><span>点击量:</span>	{{item.clicks}}</span>
+				</view>
+			</view>
+			<view class="exchange" v-if="exchangeShow" @click="exchange(item)">
+				兑换商品
+			</view>
+		</view>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		exchangeGoods
+	} from '@/apis/interfaces/coupon'
+	export default {
+		name: "GoodTemplate",
+		props: {
+			item: Object,
+			exchangeShow: {
+				type: Boolean,
+				default: function() {
+					return false;
+				}
+			},
+			//  只有提货券会把数据传递拖来，其他不会传过来的
+			couponGrantId: {
+				type: String,
+				default: function() {
+					return '';
+				}
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			exchange(item) {
+				console.error('兑换商品')
+				console.log(item, this.couponGrantId)
+				let data = {
+					conpon_grant_id: this.couponGrantId,
+					goods_id: this.item.goods_id,
+					goods_sku_id: this.item.skus[0].sku_id,
+				}
+				console.log(data)
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '您是否确认兑换该商品',
+					success: (res) => {
+						exchangeGoods(data).then(res => {
+							console.log(res)
+							this.$refs.uToast.show({
+								title: res,
+								type: 'primary',
+								duration: 3000
+							})
+							wx.setStorageSync('refresh', true)
+							setTimeout(res => {
+								uni.navigateBack({})
+							}, 3000)
+						}).catch(err => {
+							this.$refs.uToast.show({
+								title: err.message,
+								type: 'primary',
+								duration: 3000
+							})
+						})
+					}
+
+				})
+
+			},
+			goDetail(id) {
+				this.$Router.push({
+					name: 'GoodsDetail',
+					params: {
+						id: id
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// 商品列表
+	.goods-item {
+		width: calc(100% - 20rpx);
+		box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+		border-radius: 16rpx;
+		// margin-left: 20rpx;
+		margin: 40rpx 0 0 20rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		position: relative;
+
+		.exchange {
+			position: absolute;
+			bottom: 30rpx;
+			right: 30rpx;
+			padding: 6rpx 16rpx;
+			border-radius: 20rpx 0 20rpx 0;
+			background-color: $main-color;
+			color: #fff;
+			font-size: 20rpx;
+			z-index: 1;
+		}
+
+		.goods-img {
+			width: 180rpx;
+			height: 180rpx;
+			position: relative;
+			top: -20rpx;
+			left: -20rpx;
+			box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+			border-radius: 8rpx;
+		}
+
+		.goods-info {
+			flex: 1;
+			height: 180rpx;
+			padding: 20rpx 20rpx 20rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: space-around;
+			box-sizing: border-box;
+
+			.goods-title {
+				width: 100%;
+				font-size: 28rpx;
+			}
+
+			.goods-price {
+				color: $main-color;
+				padding-top: 10rpx;
+				font-weight: bold;
+				font-size: 32rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+
+				span {
+					font-size: 26rpx;
+					// padding-right: 10rpx;
+					font-weight: normal;
+
+					&:nth-child(2) {
+						padding-left: 30rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

components/mall-refunds-template/mall-refunds-template.vue

@@ -0,0 +1,175 @@
+<template>
+	<view class="MallRefundsTemplate">
+		<view class="top">
+			<view class="company">
+				<view class="company-logo">
+					<image :src="item.shop.cover" mode="aspectFill" />
+					<view class="name ellipsis">{{item.shop.name}}</view>
+				</view>
+				<view class="no ellipsis">退货单号： {{item.refund_no}}</view>
+			</view>
+			<view class="status" style="color:#ff5500;">{{item.state.text}}</view>
+		</view>
+		<view class="goods-info" @click="goDetail(item.goods_sku.goods_id)">
+			<image class="goods-img" :src="item.goods_sku.cover" mode="aspectFill" />
+			<view class="goods">
+				<view class="name">
+					<view class="name1 ellipsis-2">{{item.goods_sku.goods_name}}</view>
+					<!-- <span>￥{{item.account.balance}}</span> -->
+				</view>
+				<view class="sku">数权个数 <span>x {{item.qty}}</span> </view>
+				<!-- <view class="sku">提货方式 <span> {{item.type_text}}</span> </view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "MallRefundsTemplate",
+		data() {
+			return {
+
+			};
+		},
+		props: {
+			item: Object
+		},
+		methods: {
+			// 跳转到商品详情页面
+			goDetail(id) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?id=' + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.MallRefundsTemplate{
+		position: relative;
+		z-index: 0;
+	}
+	// 顶部信息
+	.top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding-bottom: 20rpx;
+		border-bottom: solid 1rpx #f7f7f7;
+		position: relative;
+		z-index: 0;
+
+		.company-logo {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 50%;
+				margin-right: 20rpx;
+			}
+
+			.name {
+				width: 460rpx;
+				font-size: 30rpx;
+				color: #484848;
+				font-weight: bold;
+			}
+		}
+
+
+		.no {
+			margin-top: 10rpx;
+			font-size: $title-size*0.8;
+			color: #999;
+			width: 500rpx;
+		}
+
+		.status {
+			color: #999;
+			font-size: $title-size*.9;
+			position: absolute;
+			top: 0;
+			right: 0;
+		}
+	}
+
+	// 商品信息
+	.goods-info {
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: flex-start;
+		box-sizing: border-box;
+		margin-top: 36rpx;
+
+		.goods-img {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 10rpx;
+		}
+
+		.goods {
+			flex: 1;
+			margin-left: 20rpx;
+			margin-bottom: 10rpx;
+
+			.name {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				// font-weight: bold;
+
+				.name1 {
+					// width: 340rpx;
+
+				}
+
+				span {
+					font-size: 32rpx;
+					font-weight: normal;
+				}
+			}
+
+			.sku {
+				flex: 1;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				margin-top: 10rpx;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+	}
+
+	.flexrow {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		width: 100%;
+
+		.copy {
+			color: $main-color;
+			font-size: $title-size*0.8;
+			font-weight: 400;
+			padding: 0 30rpx;
+		}
+	}
+</style>

components/mall-shipments-template/mall-shipments-template.vue

@@ -0,0 +1,171 @@
+<template>
+  <view class="MallShipmentTemplate" >
+    <view class="top" >
+      <view class="company">
+        <view class="company-logo">
+          <image :src="item.shop.cover" mode="aspectFill" />
+          <view class="name ellipsis">{{item.shop.name}}</view>
+        </view>
+		 <view class="no ellipsis">发货单号： {{item.shipment_no}}</view>
+		 <!-- <view class="no ellipsis">创建时间： {{item.created_at}}</view> -->
+      </view>
+	  <view class="status" style="color:#DD524D;">{{item.state_text}}</view>
+    </view>
+    <view class="goods-info" @click="goDetail(item.goods_sku.goods_id)">
+      <image class="goods-img" :src="item.goods_sku.cover" mode="aspectFill" />
+      <view class="goods">
+        <view class="name">
+          <view class="name1 ellipsis-2">{{item.goods_sku.goods_name}}</view> 
+		  <!-- <span>￥{{item.account.balance}}</span> -->
+        </view>
+        <view class="sku">数权个数 <span>x {{item.qty}}</span> </view>
+        <view class="sku">提货方式 <span>  {{item.type_text}}</span> </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "MallShipmentTemplate",
+    data() {
+      return {
+
+      };
+    },
+	props:{
+		item:Object
+	},
+    methods: {
+      // 跳转到商品详情页面
+      goDetail(id) {
+        uni.navigateTo({
+          url: '/pages/goods/detail?id='+id
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  // 顶部信息
+  .top {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding-bottom: 20rpx;
+    border-bottom: solid 1rpx #f7f7f7;
+	position: relative;
+	z-index: 0;
+	
+
+    .company-logo {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      box-sizing: border-box;
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .name {
+		width: 460rpx;
+        font-size: 30rpx;
+        color: #484848;
+        font-weight: bold;
+      }
+    }
+
+
+    .no {
+      margin-top: 10rpx;
+      font-size: $title-size*0.8;
+      color: #999;
+	  width: 530rpx;
+    }
+
+    .status {
+      color: #999;
+      font-size: $title-size*.9;
+	  position: absolute;
+	  top: 0;
+	  right: 0;
+    }
+  }
+
+  // 商品信息
+  .goods-info {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: flex-start;
+    box-sizing: border-box;
+    margin-top: 36rpx;
+
+    .goods-img {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 10rpx;
+    }
+
+    .goods {
+      flex: 1;
+      margin-left: 20rpx;
+	margin-bottom: 10rpx;
+
+      .name {
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        justify-content: space-between;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        // font-weight: bold;
+
+        .name1 {
+          // width: 340rpx;
+		  
+        }
+
+        span {
+          font-size: 32rpx;
+          font-weight: normal;
+        }
+      }
+
+      .sku {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        margin-top: 10rpx;
+        font-size: 28rpx;
+        color: #999;
+      }
+    }
+  }
+  .flexrow{
+	  display: flex;
+	  flex-direction: row;
+	  align-items: center;
+	  justify-content: space-between;
+	  box-sizing: border-box;
+	  width: 100%;
+	  .copy{
+		  color: $main-color;
+			font-size: $title-size*0.8;
+		  font-weight: 400;
+		  padding: 0 30rpx;
+	  }
+  }
+</style>

components/number-weight-template/number-weight-template.vue

@@ -0,0 +1,176 @@
+<template>
+  <view class="OrderTemplate" >
+    <view class="top" >
+      <view class="company">
+        <view class="company-logo">
+          <image :src="item.shop.cover" mode="aspectFill" />
+          <view class="name ellipsis">{{item.shop.name}}</view>
+        </view>
+        <view class="flexrow">
+        	<view class="no ellipsis">区块链地址： {{item.account.addr}}</view> <span class="copy" @click="copy(item.account.addr)">复制</span>
+        </view>
+      </view>
+    </view>
+    <view class="goods-info" @click="goDetail(item.goods.goods_id)">
+      <image class="goods-img" :src="item.goods.cover" mode="aspectFill" />
+      <view class="goods">
+        <view class="name">
+          <view class="name1 ellipsis-2">{{item.goods.goods_name}}</view> 
+		  <!-- <span>￥{{item.account.balance}}</span> -->
+        </view>
+        <view class="sku">数权个数 <span>x {{item.account.balance}}</span> </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: "OrderTemplate",
+    data() {
+      return {
+
+      };
+    },
+	props:{
+		item:Object
+	},
+	onShow() {
+		console.log(this.item,'onshow,numtempa')
+	},
+    methods: {
+      // 跳转到商品详情页面
+      goDetail(id) {
+        uni.navigateTo({
+          url: '/pages/goods/detail?id='+id
+        })
+      },
+	  // 复制
+	  copy(e){
+		  uni.setClipboardData({
+		      data: e,
+		      success: res=>{
+				  console.log('res',res)
+			  }
+		  })
+	  }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  // 顶部信息
+  .top {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding-bottom: 20rpx;
+    border-bottom: solid 1rpx #f7f7f7;
+
+    .company-logo {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      box-sizing: border-box;
+
+      image {
+        width: 40rpx;
+        height: 40rpx;
+        border-radius: 50%;
+        margin-right: 20rpx;
+      }
+
+      .name {
+		width: 600rpx;
+        font-size: 30rpx;
+        color: #484848;
+        font-weight: bold;
+      }
+    }
+
+
+    .no {
+      margin-top: 10rpx;
+      font-size: $title-size*0.8;
+      color: #999;
+	  width: 500rpx;
+    }
+
+    .status {
+      color: #999;
+      font-size: $title-size;
+    }
+  }
+
+  // 商品信息
+  .goods-info {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: flex-start;
+    box-sizing: border-box;
+    margin-top: 36rpx;
+
+    .goods-img {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 10rpx;
+    }
+
+    .goods {
+      flex: 1;
+      margin-left: 20rpx;
+	margin-bottom: 10rpx;
+
+      .name {
+        width: 100%;
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        justify-content: space-between;
+        box-sizing: border-box;
+        font-size: 30rpx;
+        // font-weight: bold;
+
+        .name1 {
+          // width: 340rpx;
+		  
+        }
+
+        span {
+          font-size: 32rpx;
+          font-weight: normal;
+        }
+      }
+
+      .sku {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        margin-top: 10rpx;
+        font-size: 28rpx;
+        color: #999;
+      }
+    }
+  }
+  .flexrow{
+	  display: flex;
+	  flex-direction: row;
+	  align-items: center;
+	  justify-content: space-between;
+	  box-sizing: border-box;
+	  width: 100%;
+	  .copy{
+		  color: $main-color;
+			font-size: $title-size*0.8;
+		  font-weight: 400;
+		  padding: 0 30rpx;
+	  }
+  }
+</style>

components/store-staff/store-staff.vue

@@ -1,6 +1,61 @@
 <template>
 	<view class="staff">
-		员工
+        <!-- 员工权限工具 -->
+        <view class="tool-flex store">
+            <!-- manage-scan -->
+            <view class="store-item" @click="$Router.push({name: 'Verification'})" v-if="toolList.manageScan">
+                <image class="icon" src="@/static/icons/tool_icon_00.png" mode="aspectFill"></image>
+                <view class="title">扫码核销</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- manage-goods -->
+            <view class="store-item" @click="$Router.push({name: 'GoodsMag'})" v-if="toolList.manageGoods">
+                <image class="icon" src="@/static/icons/tool_icon_01.png" mode="aspectFill"></image>
+                <view class="title">商品权证</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- manage-employee -->
+            <view class="store-item" @click="$Router.push({name: 'Employees'})" v-if="toolList.manageEmployee">
+                <image class="icon" src="@/static/icons/tool_icon_08.png" mode="aspectFill"></image>
+                <view class="title">员工管理</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- order-shipment -->
+            <view class="store-item" @click="$Router.push({name: ''})" v-if="toolList.orderShipment">
+                <image class="icon" src="@/static/icons/tool_icon_04.png" mode="aspectFill"></image>
+                <view class="title">发货单管理</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- order-refund -->
+            <view class="store-item" @click="$Router.push({name: ''})" v-if="toolList.orderRefund">
+                <image class="icon" src="@/static/icons/tool_icon_07.png" mode="aspectFill"></image>
+                <view class="title">退换货管理</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- manageStore -->
+            <view class="store-item" @click="$Router.push({name: 'shopLists'})" v-if="toolList.manageStore">
+                <image class="icon" src="@/static/icons/tool_icon_07.png" mode="aspectFill"></image>
+                <view class="title">部门/门店</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <!-- manage-coupons -->
+            <view class="store-item" @click="$Router.push({name: 'CouponsMag'})" v-if="toolList.manageCoupons">
+                <image class="icon" src="@/static/icons/tool_icon_02.png" mode="aspectFill"></image>
+                <view class="title">优惠券管理</view>
+                <image class="arrow" src="@/static/icons/equity_arrow_right.png" mode="aspectFill"></image>
+            </view>
+            
+            <view class="store-item">
+            	<image class="icon" src="@/static/icons/tool_icon_06.png" mode="aspectFill"></image>
+            	<view class="title">营销推广码</view>
+            </view>
+        </view>
 	</view>
 </template>
 
@@ -8,46 +63,12 @@
 	export default {
 		name:"store-staff",
 		props:{
-			// 店铺统计
+			// 员工数据
-			top: {
+			toolList: {},
-				type: Object,
+		},
-				default: ()=> {
+	    created() {
-					return {
+	        // console.log(this.$props.toolList)
-						barter_total: 0,
+	    }
-						trading_day	: 0,
-						eb_in		: 0,
-						cash_in		: 0
-					}
-				}
-			},
-			// 店铺概况
-			middle: {
-				type: Object,
-				default: ()=> {
-					return {
-						visitors : 0,
-						clinch	 : 0,
-						employees: 0,
-						sale	 : 0,
-						hold	 : 0,
-						transfer : 0
-					}
-				}
-			},
-			// 店铺订单
-			order: {
-				type: Object,
-				default: ()=> {
-					return {
-						not_shipped		: 0,
-						already_shipped	: 0,
-						not_pick		: 0,
-						already_pick	: 0,
-						after_sale		: 0
-					}
-				}
-			}
-		}
 	}
 </script>
 
@@ -57,7 +78,7 @@
 		.statistical{
 			display: flex;
 			background: $text-price;
-			padding: $padding ($padding/2) $padding*5;
+			padding: $padding ($padding/2) $padding*2;
 			flex-wrap: wrap;
 			justify-content: space-between;
 			.item{
@@ -76,15 +97,15 @@
 		}
 		// 店铺概况
 		.general{
-			margin: -$margin*4 $margin 0 $margin;
+			margin: -$margin*2 $margin 0 $margin;
 			.general-box{
 				background-color: white;
 				border-radius: $radius/2;
 				display: flex;
-				padding: $padding $padding/2;
+				padding: $padding - 20 $padding/2;
 				flex-wrap: wrap;
 				.general-item{
-					width: 33.33%;
+					width: 50%;
 					text-align: center;
 					padding: $padding/2;
 					box-sizing: border-box;
@@ -103,27 +124,34 @@
 		}
 		// 店铺工具
 		.tool-flex{
-			background: white;
+			margin: $margin*2 $margin $margin;
-			border-radius: $radius/2;
-			padding: $padding/2;
-			margin: $margin;
-			display: flex;
-			flex-wrap: wrap;
 			.store-item{
-				padding: $padding/2;
+                background: white;
-				text-align: center;
+                border-radius: $radius/2;
-				width: 25%;
+                padding: $padding/2;
 				box-sizing: border-box;
+                margin-bottom: $margin;
+                display: flex;
+                position: relative;
 				.icon{
-					width: 68rpx;
+					width: 54rpx;
-					height: 68rpx;
+					height: 54rpx;
+                    margin-right: $margin - 15;
 					vertical-align: top;
 				}
 				.title{
-					font-size: $title-size-sm;
+                    line-height: 58rpx;
+					font-size: $title-size-m;
 					color: $text-gray;
-					padding-top: $padding/3;
 				}
+                .arrow {
+                    width: 38rpx;
+                    height: 38rpx;
+                    filter: brightness(.9);
+                    position: absolute;
+                    right: $padding - 20;
+                    top: $padding - 6;
+                }
 			}
 			.order-item{
 				position: relative;

pages.json

@@ -1,334 +1,421 @@
 {
 	"pages": [{
-		"path": "pages/equity/index",
+			"path": "pages/equity/index",
-		"name": "Equity",
+			"name": "Equity",
-		"style": {
+			"style": {
-			"navigationStyle": "custom",
+				"navigationStyle": "custom",
-			"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white"
-		}
-	}, {
-		"path": "pages/market/index",
-		"name": "Market",
-		"style": {
-			"navigationBarTitleText": "转让市场",
-			"titleNView": {
-				"backgroundColor": "#FFFFFF",
-				"buttons": [{
-					"text": "成交历史",
-					"fontSize": "14",
-					"width": "80",
-					"color": "#555555"
-				}]
 			}
-		}
+		}, {
-	}, {
+			"path": "pages/market/index",
-		"path": "pages/store/index",
+			"name": "Market",
-		"name": "Store",
+			"style": {
-		"style": {
+				"navigationBarTitleText": "转让市场",
-			"navigationStyle": "custom",
-			"navigationBarTitleText": "企业工具",
-			"navigationBarTextStyle": "white",
-			"navigationBarBackgroundColor": "#e93340"
-		}
-	}, {
-		"path": "pages/property/index",
-		"name": "Property",
-		"style": {
-			"navigationBarTitleText": "",
-			"navigationStyle": "custom",
-			"navigationBarTextStyle": "white"
-		}
-	}, {
-		"path": "pages/property/address/list",
-		"name": "AddressList",
-		"style": {
-			"navigationBarTitleText": "地址管理",
-			"navigationBarTextStyle": "white",
-			"navigationBarBackgroundColor": "#e93340"
-		}
-	}, {
-		"path": "pages/property/address/create",
-		"name": "AddressCreate",
-		"style": {
-			"navigationBarTitleText": "地址新增",
-			"navigationBarTextStyle": "white",
-			"navigationBarBackgroundColor": "#e93340"
-		}
-	}, {
-		"path": "pages/goods/details",
-		"name": "goodsDetails",
-		"style": {
-			"navigationBarTitleText": "",
-			"titleNView": {
-				"backgroundColor": "#FFFFFF",
-				"type": "transparent",
-				"buttons": [{
-					"text": "分享",
-					"fontSize": "12",
-					"color": "#555555"
-				}]
-			}
-		}
-	}, {
-		"path": "pages/login/login",
-		"name": "Login",
-		"style": {
-			"navigationBarTitleText": "",
-			"navigationBarBackgroundColor": "#FFFFFF",
-			"disableScroll": true
-		}
-	}, {
-		"path": "pages/company/registered",
-		"name": "Registered",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	}, {
-		"path": "pages/company/prompt",
-		"name": "Prompt",
-		"style": {
-			"navigationBarTitleText": "",
-			"navigationBarBackgroundColor": "#FFFFFF",
-			"disableScroll": true,
-			"titleNView": {
-				"backgroundColor": "#FFFFFF",
-				"buttons": [{
-					"text": "先逛一逛",
-					"fontSize": "14",
-					"width": "80",
-					"color": "#555555"
-				}]
-			}
-		}
-	}, {
-		"path": "pages/vip/index",
-		"name": "Vip",
-		"style": {
-			"navigationBarTitleText": "会员",
-			"navigationBarBackgroundColor": "#1f1b1c",
-			"navigationBarTextStyle": "white",
-			"backgroundColor": "#fefaef"
-		}
-	}, {
-		"path": "pages/equity/search",
-		"name": "Search",
-		"style": {
-			"navigationBarTitleText": "搜索"
-		}
-	}, {
-		"path": "pages/market/logs",
-		"name": "marketLogs",
-		"style": {
-			"navigationBarTitleText": "成交历史"
-		}
-	}, {
-		"path": "pages/order/buy",
-		"name": "Buy",
-		"style": {
-			"navigationBarTitleText": "确认订单",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/order/index",
-		"name": "Order",
-		"style": {
-			"navigationBarTitleText": "订单管理"
-		}
-	}, {
-		"path": "pages/order/details",
-		"name": "OrderDetails",
-		"style": {
-			"navigationBarTitleText": "订单详情"
-		}
-	}, {
-		"path": "pages/order/sales",
-		"name": "Sales",
-		"style": {
-			"navigationBarTitleText": "售后"
-		}
-	}, {
-		"path": "pages/goods/lists",
-		"name": "goodsList",
-		"style": {
-			"navigationBarTitleText": "商品列表",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/company/approve",
-		"name": "Approve",
-		"style": {
-			"navigationBarTitleText": ""
-		}
-	}, {
-		"path": "pages/store/visitors",
-		"name": "Visitors",
-		"style": {
-			"navigationBarTitleText": "访客统计",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/store/customer",
-		"name": "Customer",
-		"style": {
-			"navigationBarTitleText": "成交客户",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/store/basics",
-		"name": "Basics",
-		"style": {
-			"navigationBarTitleText": "基础信息",
-			"app-plus": {
 				"titleNView": {
 					"backgroundColor": "#FFFFFF",
 					"buttons": [{
-						"text": "保存",
+						"text": "成交历史",
-						"fontSize": "16",
+						"fontSize": "14",
 						"width": "80",
-						"color": "#e93340"
+						"color": "#555555"
 					}]
 				}
 			}
-		}
+		}, {
-	}, {
+			"path": "pages/store/index",
-		"path": "pages/employees/list",
+			"name": "Store",
-		"name": "Employees",
+			"style": {
-		"style": {
+				"navigationStyle": "custom",
-			"navigationBarTitleText": "员工",
+				"navigationBarTitleText": "企业工具",
-			"app-plus": {
+				"navigationBarTextStyle": "white",
-				"bounce": "none",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/index",
+			"name": "Property",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/property/address/list",
+			"name": "AddressList",
+			"style": {
+				"navigationBarTitleText": "地址管理",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/address/create",
+			"name": "AddressCreate",
+			"style": {
+				"navigationBarTitleText": "地址新增",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/numberWeight",
+			"name": "NumberWeight",
+			"style": {
+				"navigationBarTitleText": "我的权证",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},
+		{
+			"path": "pages/property/order/numberWeightInfo",
+			"name": "NumberWeightInfo",
+			"style": {
+				"navigationBarTitleText": "权证详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/mallShipments",
+			"name": "MallShipments",
+			"style": {
+				"navigationBarTitleText": "已经提货",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/logistics",
+			"name": "Orderlogistics",
+			"style": {
+				"navigationBarTitleText": "查看物流",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/mallShipmentsInfo",
+			"name": "MallShipmentsInfo",
+			"style": {
+				"navigationBarTitleText": "提货单详情页面",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/mallRefundsInfo",
+			"name": "MallRefundsInfo",
+			"style": {
+				"navigationBarTitleText": "退货单详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		}, {
+			"path": "pages/property/order/mallShipmentsRefund",
+			"name": "MallShipmentsRefund",
+			"style": {
+				"navigationBarTitleText": "申请退货",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340"
+			}
+		},
+		{
+			"path": "pages/property/coupon/coupon",
+			"name": "CouponList",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "我的优惠券"
+			}
+		}, {
+			"path": "pages/property/coupon/couponMore",
+			"name": "CouponMoreList",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "优惠券列表"
+			}
+		}, {
+			"path": "pages/property/coupon/detail",
+			"name": "CouponDetail",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "优惠券详情"
+			}
+		},
+		{
+			"path": "pages/goods/details",
+			"name": "goodsDetails",
+			"style": {
+				"navigationBarTitleText": "",
+				"titleNView": {
+					"backgroundColor": "#FFFFFF",
+					"type": "transparent",
+					"buttons": [{
+						"text": "分享",
+						"fontSize": "12",
+						"color": "#555555"
+					}]
+				}
+			}
+		}, {
+			"path": "pages/login/login",
+			"name": "Login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"disableScroll": true
+			}
+		}, {
+			"path": "pages/company/registered",
+			"name": "Registered",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "pages/company/prompt",
+			"name": "Prompt",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"disableScroll": true,
 				"titleNView": {
 					"backgroundColor": "#FFFFFF",
 					"buttons": [{
-						"text": "添加",
+						"text": "先逛一逛",
+						"fontSize": "14",
+						"width": "80",
+						"color": "#555555"
+					}]
+				}
+			}
+		}, {
+			"path": "pages/vip/index",
+			"name": "Vip",
+			"style": {
+				"navigationBarTitleText": "会员",
+				"navigationBarBackgroundColor": "#1f1b1c",
+				"navigationBarTextStyle": "white",
+				"backgroundColor": "#fefaef"
+			}
+		}, {
+			"path": "pages/equity/search",
+			"name": "Search",
+			"style": {
+				"navigationBarTitleText": "搜索"
+			}
+		}, {
+			"path": "pages/market/logs",
+			"name": "marketLogs",
+			"style": {
+				"navigationBarTitleText": "成交历史"
+			}
+		}, {
+			"path": "pages/order/buy",
+			"name": "Buy",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/order/index",
+			"name": "Order",
+			"style": {
+				"navigationBarTitleText": "订单管理"
+			}
+		}, {
+			"path": "pages/order/details",
+			"name": "OrderDetails",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		}, {
+			"path": "pages/order/sales",
+			"name": "Sales",
+			"style": {
+				"navigationBarTitleText": "售后"
+			}
+		}, {
+			"path": "pages/goods/lists",
+			"name": "goodsList",
+			"style": {
+				"navigationBarTitleText": "商品列表",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/company/approve",
+			"name": "Approve",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}, {
+			"path": "pages/store/visitors",
+			"name": "Visitors",
+			"style": {
+				"navigationBarTitleText": "访客统计",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/store/customer",
+			"name": "Customer",
+			"style": {
+				"navigationBarTitleText": "成交客户",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/store/basics",
+			"name": "Basics",
+			"style": {
+				"navigationBarTitleText": "基础信息",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"buttons": [{
+							"text": "保存",
+							"fontSize": "16",
+							"width": "80",
+							"color": "#e93340"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "pages/employees/list",
+			"name": "Employees",
+			"style": {
+				"navigationBarTitleText": "员工",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"buttons": [{
+							"text": "添加",
+							"fontSize": "14",
+							"width": "80",
+							"color": "#e93340"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "pages/employees/add",
+			"name": "addEmployees",
+			"style": {
+				"navigationBarTitleText": "添加员工",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/goods/management",
+			"name": "GoodsMag",
+			"style": {
+				"navigationBarTitleText": "产品权证",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#FFFFFF",
+						"buttons": [{
+							"text": "发布",
+							"fontSize": "16",
+							"width": "80",
+							"color": "#e93340"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "pages/goods/addClassify",
+			"name": "addClassify",
+			"style": {
+				"navigationBarTitleText": "选择权证分类",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/goods/add",
+			"name": "GoodsMagAdd",
+			"style": {
+				"navigationBarTitleText": "发布权证",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}, {
+			"path": "pages/coupons/index",
+			"name": "Coupons",
+			"style": {
+				"navigationBarTitleText": "优惠券"
+			}
+		}, {
+			"path": "pages/coupons/management",
+			"name": "CouponsMag",
+			"style": {
+				"navigationBarTitleText": "优惠券管理",
+				"titleNView": {
+					"backgroundColor": "#FFFFFF",
+					"buttons": [{
+						"text": "发布",
 						"fontSize": "14",
 						"width": "80",
 						"color": "#e93340"
 					}]
 				}
 			}
-		}
+		}, {
-	}, {
+			"path": "pages/coupons/add",
-		"path": "pages/employees/add",
+			"name": "couponsAdd",
-		"name": "addEmployees",
+			"style": {
-		"style": {
+				"navigationBarTitleText": "发布优惠券",
-			"navigationBarTitleText": "添加员工",
+				"navigationBarBackgroundColor": "#FFFFFF"
-			"navigationBarBackgroundColor": "#FFFFFF"
+			}
-		}
+		}, {
-	}, {
+			"path": "pages/coupons/selectGoods",
-		"path": "pages/goods/management",
+			"name": "selectGoods",
-		"name": "GoodsMag",
+			"style": {
-		"style": {
+				"navigationBarTitleText": "选择产品",
-			"navigationBarTitleText": "产品权证",
+				"navigationBarBackgroundColor": "#FFFFFF"
-			"app-plus": {
+			}
+		}, {
+			"path": "pages/coupons/magDetails",
+			"name": "magDetails",
+			"style": {
+				"navigationBarTitleText": "优惠券详情"
+			}
+		}, {
+			"path": "pages/verification/index",
+			"name": "Verification",
+			"style": {
+				"navigationBarTitleText": "扫码验证"
+			}
+		}, {
+			"path": "pages/verification/details",
+			"name": "VerificationDetails",
+			"style": {
+				"navigationBarTitleText": "核销券详情"
+			}
+		}, {
+			"path": "pages/shop/lists",
+			"name": "shopLists",
+			"style": {
+				"navigationBarTitleText": "部门/门店",
+				"navigationBarBackgroundColor": "#FFFFFF",
 				"titleNView": {
-					"backgroundColor": "#FFFFFF",
 					"buttons": [{
-						"text": "发布",
+						"text": "创建",
-						"fontSize": "16",
+						"fontSize": "14",
 						"width": "80",
 						"color": "#e93340"
 					}]
 				}
 			}
-		}
+		}, {
-	}, {
+			"path": "pages/shop/create",
-		"path": "pages/goods/addClassify",
+			"name": "shopCreate",
-		"name": "addClassify",
+			"style": {
-		"style": {
+				"navigationBarTitleText": "创建门店/部门",
-			"navigationBarTitleText": "选择权证分类",
+				"navigationBarBackgroundColor": "#FFFFFF"
-			"navigationBarBackgroundColor": "#FFFFFF"
+			}
-		}
+		}, {
-	}, {
+			"path": "pages/goods/goodsAuth",
-		"path": "pages/goods/add",
+			"name": "goodsAuth",
-		"name": "GoodsMagAdd",
+			"style": {
-		"style": {
+				"navigationBarTitleText": "商品认证信息",
-			"navigationBarTitleText": "发布权证",
+				"navigationBarBackgroundColor": "#FFFFFF"
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/coupons/index",
-		"name": "Coupons",
-		"style": {
-			"navigationBarTitleText": "优惠券"
-		}
-	}, {
-		"path": "pages/coupons/management",
-		"name": "CouponsMag",
-		"style": {
-			"navigationBarTitleText": "优惠券管理",
-			"titleNView": {
-				"backgroundColor": "#FFFFFF",
-				"buttons": [{
-					"text": "发布",
-					"fontSize": "14",
-					"width": "80",
-					"color": "#e93340"
-				}]
 			}
 		}
-	}, {
+	],
-		"path": "pages/coupons/add",
-		"name": "couponsAdd",
-		"style": {
-			"navigationBarTitleText": "发布优惠券",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/coupons/selectGoods",
-		"name": "selectGoods",
-		"style": {
-			"navigationBarTitleText": "选择产品",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/coupons/magDetails",
-		"name": "magDetails",
-		"style": {
-			"navigationBarTitleText": "优惠券详情"
-		}
-	}, {
-		"path": "pages/verification/index",
-		"name": "Verification",
-		"style": {
-			"navigationBarTitleText": "扫码验证"
-		}
-	}, {
-		"path": "pages/verification/details",
-		"name": "VerificationDetails",
-		"style": {
-			"navigationBarTitleText": "核销券详情"
-		}
-	}, {
-		"path": "pages/shop/lists",
-		"name": "shopLists",
-		"style": {
-			"navigationBarTitleText": "部门/门店",
-			"navigationBarBackgroundColor": "#FFFFFF",
-			"titleNView": {
-				"buttons": [{
-					"text": "创建",
-					"fontSize": "14",
-					"width": "80",
-					"color": "#e93340"
-				}]
-			}
-		}
-	}, {
-		"path": "pages/shop/create",
-		"name": "shopCreate",
-		"style": {
-			"navigationBarTitleText": "创建门店/部门",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}, {
-		"path": "pages/goods/goodsAuth",
-		"name": "goodsAuth",
-		"style": {
-			"navigationBarTitleText": "商品认证信息",
-			"navigationBarBackgroundColor": "#FFFFFF"
-		}
-	}],
 	"tabBar": {
 		"color": "#bababa",
 		"selectedColor": "#e93340",

pages/goods/attestation.vue

@@ -0,0 +1,186 @@
+<template>
+    <view class="GoodsAuthentication">
+    	<view class="authenticationTop">区块链溯源码：{{info.token}}</view>
+    	<!-- 商品认证 商品和服务 -->
+    	<view class="authenticationItem">
+    		<view class="authenticationItemTitle">商品认证</view>
+    		<view class="authenticationItemcontent" v-if="info.goods">
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">{{info.goods.type ===1?'商品名称':'项目名称'}}: </view>
+    				<view class="content">{{info.goods.name || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===1">
+    				<view class="title">生产批次：</view>
+    				<view class="content">{{info.goods.batch || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===2" >
+    				<view class="title">项目分类：</view>
+    				<view class="content">{{info.goods.category || '暂无数据'}}</view>
+    			</view>
+    		
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===1">
+    				<view class="title">规格：</view>
+    				<view class="content">{{info.goods.skus[0].unit || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">数量：</view>
+    				<view class="content">{{info.goods.skus[0].stock || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">售价：</view>
+    				<view class="content">{{info.goods.skus[0].price || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===1">
+    				<view class="title">生产日期：</view>
+    				<view class="content">{{info.goods.producted_at || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" >
+    				<view class="title">{{info.goods.type ===1?'保质期':'有效期'}}：</view>
+    				<view class="content">{{info.goods.expiried_at || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===1">
+    				<view class="title">生产厂家：</view>
+    				<view class="content">{{info.goods.product_name || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" v-if="info.goods.type ===1">
+    				<view class="title">生产地：</view>
+    				<view class="content">{{info.goods.product_address || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" >
+    				<view class="title">供应商：</view>
+    				<view class="content">{{info.goods.skus[0].price || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem" >
+    				<view class="title">经营许可证：</view>
+    				<view class="content">{{info.goods.lisence || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem"  >
+    				<view class="title">实物照片：</view>
+    				<image class="img" v-if="info.goods.cover"  :src="info.goods.cover" @click="priveImg(info.goods.cover)" mode="aspectFill" />
+    				<view class="content" v-else>暂无数据</view>
+    			</view>
+    		</view>
+    	</view>
+    	
+    	<!-- 企业认证 （商品和服务通用） -->
+    	<view class="authenticationItem">
+    		<view class="authenticationItemTitle">企业认证</view>
+    		<view class="authenticationItemcontent" v-if="info.certification">
+    			<view class="authenticationItemcontentItem" >
+    				<view class="title">企业名称：</view>
+    				<view class="content">{{info.certification.name || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">企业地址：</view>
+    				<view class="content">{{info.certification.address || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">统一信用代码：</view>
+    				<view class="content">{{info.certification.certification.code || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">行业：</view>
+    				<view class="content">{{info.certification.industry.title || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">经营范围：</view>
+    				<view class="content">{{info.certification.range || '暂无数据'}}</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">联系电话：</view>
+    				<u-icon name="phone-fill" v-if='info.certification.contack' @click="call(info.certification.contact)" 
+    				color="#2979ff" label-color="#2979ff" label-size="26" :label='info.certification.contact' />
+    				<view class="content" v-else>		 暂无数据			</view>
+    			</view>
+    			<view class="authenticationItemcontentItem">
+    				<view class="title">营业执照：</view>
+    				<image class="img"  v-if='info.certification.certification.license' :src="info.certification.certification.license"  @click="priveImg(info.certification.certification.license)" mode="aspectFill" />
+    				<view class="content" v-else>暂无数据</view>
+    			</view>
+    		</view>
+    	</view>
+    	
+    	<!-- 弹窗提示喽 -->
+    	<u-toast ref="uToast" />
+    </view>
+</template>
+
+<script>
+    import { managesAttestation } from '@/apis/interfaces/goods'
+    export default {
+    	data() {
+    		return {
+    			info: ''
+    		}
+    	},
+        created() {
+            managesAttestation(this.$Route.query.id).then(res=>{
+                console.log(res)
+                this.info = res
+            })
+        },
+    	methods: {}
+    }
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.GoodsAuthentication {
+		padding: 30rpx;
+
+		.authenticationTop {
+			width: 100%;
+			padding: 20rpx 50rpx;
+			background-color: #c82626;
+			font-size: 26rpx;
+			color: #fff;
+			border-radius: 60rpx;
+			word-break: break-all;
+			text-align: center;
+		}
+		// 商品认证
+		.authenticationItem{
+			width: 100%;
+			min-height: 300rpx;
+			margin-top: 20rpx;
+			.authenticationItemTitle{
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: 600;
+				padding: 30rpx 20rpx;
+			}
+			.authenticationItemcontent{
+				width: 100%;
+				min-height: 500rpx;
+				background-color: #fff;
+				border-radius: 20rpx;
+				border: solid rgba(200,38,0,.05) 6rpx;
+				box-shadow:2rpx 2rpx 20rpx 0rpx rgba(200,38,0,.051);
+				padding:10rpx 20rpx;
+				.authenticationItemcontentItem{
+					display: flex;
+					flex-direction: row;
+					align-items: flex-start;
+					justify-content: flex-start;
+					box-sizing: border-box;
+					padding: 20rpx 0;
+					font-size: 24rpx;
+					.title{
+						width: 180rpx;
+					}
+					.content{
+						text-overflow: ellipsis;
+						width: calc( 100% - 180rpx);
+					}
+					.img{
+						width: 340rpx;
+						height: 200rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/goods/chain.vue

@@ -0,0 +1,117 @@
+<template>
+	<view class="GoodsChain">
+		<image src="https://e-chain.cnskl.com/storage/imageresource/chain-bg.png" class='chainBg' />
+		<view class="chain-content">
+			<view class="chain-center">
+				<image src="/static/images/service-logi.png" mode="aspectFill" class="logo" />
+				<view class="name">易品新境区块链溯源证书</view>
+				<view class="no">区块链溯源证书：{{info.token}}</view>
+				<view class="content">
+					<view class="con-item">兹证明：</view>
+					<view class="con-item" v-if="info.company">
+						{{info.company.name}}，产品符合溯源规范，认证内容如下：特授权其产品在易品新境区块链溯源商城出售！
+					</view>
+					<view class="con-item">交易哈希: {{info.hash}}</view>
+					<view class="con-item">区块链高度: {{info.height}}</view>
+				</view>
+				<view class="date" v-if="info.applied_at">授权时间: {{info.applied_at}}</view>
+				<view class="date">有效期至: {{info.ended_at}}</view>
+				<view class="companyInfo">易品新境区块链有限公司</view>
+			</view>
+		</view>
+		
+		<!-- 弹窗提示喽 -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+    import { managesChain } from '@/apis/interfaces/goods'
+	export default {
+		data() {
+			return {
+				info: ''
+			}
+		},
+        created() {
+            managesChain(this.$Route.query.id).then(res=>{
+                this.info = res
+            })
+        },
+		methods: {}
+	}
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background-color: #F7F7F7;
+    }
+
+	.GoodsChain {
+		background-color:fff;
+		width: 100%;
+		min-height: 100vh;
+		position: relative;
+		z-index: 1;
+		.chainBg{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			z-index: 2;
+		}
+		.chain-content{
+			width: 100%;
+			height: 100vh;
+			z-index: 2;
+			padding: 18vh 10vw 15vh 10vw ;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 3;
+			.chain-center{
+				width: 100%;
+				height: 100%;
+				.logo{
+					width: 160rpx;
+					height: 160rpx;
+					border-radius: 50%;
+					position: relative;
+					margin-left: -80rpx;
+					left: 50%;
+					margin-bottom: 20rpx;
+					border: solid rgba($color: #fff, $alpha: .3) 10rpx;
+				}
+				.name{
+					font-size: 40rpx;
+					font-weight: bold;
+					text-align: center;
+				}
+				.no{
+					font-size: 26rpx;
+					font-weight: bold;
+					text-align: center;
+					margin-top: 10rpx;
+				}
+			
+				.content{
+					margin-top: 60rpx;
+					font-size: 28rpx;
+					padding: 0 20rpx;
+					.con-item{
+						margin-bottom: 30rpx;
+						word-break: break-all;
+					}
+				}
+				.date{
+					text-align: right;
+					margin-bottom: 10rpx;
+					padding-right: 20rpx;
+				}
+				.companyInfo{
+					text-align: right;
+					margin-bottom: 40rpx;
+					padding-right: 20rpx;
+				}
+			}
+		}
+	}
+</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">
+                    <view class="tooSee-label" @click="$Router.push({name: 'GoodsChain', params: {id: goodsObj.goods_id}})">
                         区块链证书
+                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
                     </view>
-                    <view class="tooSee-label">
+                    <view class="tooSee-label" @click="$Router.push({name: 'GoodsAttestation', params: {id: goodsObj.goods_id}})">
                         商品认证
+                        <image class="tooSee-label-img" src="../../static/icons/equity_arrow_right.png" mode="aspectFill"></image>
                     </view>
-                    <view class="tooSee-label">
+                    <view class="tooSee-label" @click="$Router.push({name: 'GoodstracedTo', params: {id: goodsObj.goods_id}})">
                         商品溯源
+                        <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,11 +89,84 @@
 		<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" @click="drawCoupons(item.coupon_id)">
+                            领取
+                        </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>
 
 <script>
-	import { goods } from '@/apis/interfaces/goods'
+	import { goods, managesCoupons } from '@/apis/interfaces/goods'
 	import userAuth from '@/public/userAuth'
 	export default {
 		data() {
@@ -101,7 +181,6 @@
 		},
 		created() {
 			goods(this.$Route.query.id || 16).then(res=>{
-                console.log(res.coupons)
 				this.loding   = false
 				this.goodsObj = res
 				this.identity = res.identity.id || ''
@@ -153,7 +232,35 @@
 						})
 					}
 				})
-			}
+			},
+            
+            // 领取优惠券
+            drawCoupons(id){
+                console.log(id)
+                managesCoupons(id).then(res=>{
+                	console.log(res)
+                })
+            },
+            
+            // 选择优惠券-显示
+            couponsOpne(){
+            	this.$refs.couponsPopup.open('bottom')
+            },
+            
+            // 选择优惠券-隐藏
+            couponsClose(){
+            	this.$refs.couponsPopup.close()
+            },
+            
+            // 查看保障服务-显示
+            serveOpne(){
+            	this.$refs.servePopup.open('bottom')
+            },
+            
+            // 查看保障服务-隐藏
+            serveClose() {
+                this.$refs.servePopup.close()
+            }
 		}
 	}
 </script>
@@ -205,8 +312,8 @@
                     font-size: 24rpx;
                     border-radius: 50rpx;
                     padding: 0 10rpx;
-                    height: 38rpx;
+                    height: 34rpx;
-                    line-height: 38rpx;
+                    line-height: 36rpx;
                     margin: 6rpx 10rpx 0 0;
                 }
 			}
@@ -242,46 +349,70 @@
                 background-color: #fef2f2;
                 color: #e1293f;
                 border-radius: 8rpx;
-                border: 2rpx solid #e7e2df;
+                border: 1rpx solid #ffe5e5;
-                padding: $padding - 10;
+                padding: $padding - 15;
                 box-sizing: border-box;
                 display: flex;
                 position: relative;
                 margin-bottom: $margin - 10;
                 .coupon-list {
-                    font-size: 24rpx;
+                    font-size: 22rpx;
                     .coupon-label {
                         display: inline-block;
-                        border: 2rpx solid #e1293f;
+                        border: 1rpx solid #e998a1;
                         border-radius: 50rpx;
-                        padding: 4rpx 15rpx;
+                        padding: 0 15rpx;
+                        height: 34rpx;
+                        line-height: 34rpx;
                         margin-right: $margin - 10;
                     }
                 }
                 .coupon-btn {
                     position: absolute;
-                    right: $padding - 10;
+                    right: $padding - 20;
-                    top: $padding - 10;
+                    top: 0;
-                    font-size: 28rpx;
+                    line-height: 60rpx;
+                    font-size: 24rpx;
                     display: flex;
                     font-weight: 700;
                     .coupon-btn-img {
-                        width: 30rpx;
+                        width: 22rpx;
-                        height: 30rpx;
+                        height: 22rpx;
-                        margin-top: 6rpx;
+                        margin: 20rpx 0 0 4rpx;
                     }
                 }
             }
 		}
+            
+        // 新增服务
+        .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;
+			min-height: 220rpx;
 			.logo{
 				position: absolute;
 				left: $margin;
@@ -311,8 +442,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 +482,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 +529,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 +585,131 @@
 			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;
+        }
+    }
+    
+    .serve-cont {
+        height: 40vh;
+        overflow-y: scroll;
+    }
 </style>

pages/goods/tracedTo.vue

@@ -0,0 +1,199 @@
+<template>
+    <view class="GoodsAuthentication">
+    	<view class="authenticationTop" v-if='list.length>0'>区块链溯源码：{{info.token}}</view>
+    	<!-- 进度条 -->
+    	<view v-if='list.length>0' class='timeAxis'>
+            <view class="box-top"  v-for="(item,index) in list" :key="index">
+            	<view class="left-box-top"><span>商品交易</span>{{item.blockTime}}</view> <!-- 左边 -->
+            	<view class="line" :class="{active:true,none:index==(list.length-1)}"><!-- 中线 -->
+            		<view class="dot" :class="{active:true}"></view><!-- 圆点 -->
+            	</view>
+                
+                <!-- 右边 -->
+            	<view class="right-box-top">
+            		<view class="authenticationItem">
+            			<view class="authenticationItemcontent">
+            				<view class="authenticationItemcontentItem" v-if="item.goods">
+            					<view class="title">名称：</view>
+            					<view class="content">{{item.goods.name}}</view>
+            				</view>
+            				<view class="authenticationItemcontentItem" v-if="item.goods">
+            					<view class="title">规格：</view>
+            					<view class="content">{{item.goods.skus[0].unit}}</view>
+            				</view>
+            				<view class="authenticationItemcontentItem">
+            					<view class="title">购买数量：</view>
+            					<view class="content">{{item.amount}}</view>
+            				</view>
+            				<view class="authenticationItemcontentItem">
+            					<view class="title">区块链高度：</view>
+            					<view class="content">{{item.height}}</view>
+            				</view>
+            				<view class="authenticationItemcontentItem">
+            					<view class="title">交易哈希：</view>
+            					<view class="content">{{item.hash}}</view>
+            				</view>
+            				<view class="zhushi">注释：{{item.note}}</view>
+            			</view>
+            		</view>
+            	</view>
+            </view>
+        </view>
+    
+    	<no-list v-if="list.length === 0" name='no-chain' txt="没有任何数据哦~" />
+    	<!-- 弹窗提示喽 -->
+    	<u-toast ref="uToast" />
+    </view>
+</template>
+
+<script>
+    import { managesTracedTo } from '@/apis/interfaces/goods'
+	export default {
+		data() {
+			return {
+				list: '',
+                info: ''
+			}
+		},
+        created() {
+            console.log(this.$Route.query.id)
+            managesTracedTo(this.$Route.query.id).then(res=>{
+                console.log(res)
+                this.list = res.list
+                this.info = res
+            })
+        },
+		methods: {}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.GoodsAuthentication {
+		padding: 30rpx;
+		.authenticationTop {
+			width: 100%;
+			padding: 20rpx 50rpx;
+			background-color: #c82626;
+			font-size: 26rpx;
+			color: #fff;
+			border-radius: 60rpx;
+			word-break: break-all;
+			text-align: center;
+			margin-bottom: 40rpx;
+		}
+
+		// 商品认证
+		.authenticationItem {
+			width: 100%;
+			min-height: 300rpx;
+			.authenticationItemTitle {
+				font-size: 30rpx;
+				color: #333333;
+				font-weight: 600;
+				padding: 30rpx 20rpx;
+			}
+		}
+
+		.timeAxis {
+			margin-top: 60rpx;
+		}
+	}
+    
+    .box-top{
+    	width: 100%;
+    	min-height: 120rpx;
+    	box-sizing: border-box;
+    	display: flex;
+    	flex-direction: row;
+    	.left-box-top{
+    		width: 124rpx;
+    		text-align: center;
+    		color: #cacaca;
+    		font-size: 22rpx;
+    		padding-top: 0;
+    		display: flex;
+    		flex-direction: column;
+    		align-items: flex-end;
+    		justify-content: flex-start;
+    		box-sizing: border-box;
+    		span{
+    			font-size: 28rpx;
+    			// font-weight: bold;
+    			color:#333;
+    			padding-bottom: 10rpx;
+    			padding-right: 4rpx;
+    		}
+    	}
+    	.line{
+    		width: 2rpx;	
+    		background-color: rgba(228,231,237,1);
+    		margin: 0 20rpx 0 20rpx;
+    		padding-top: 0;
+    		.dot{
+    			width: 20rpx;
+    			height: 20rpx;
+    			background-color: rgba(228,231,237,1);
+    			border-radius: 50%;
+    			position: relative;
+    			left: -10rpx;
+    		}
+    	}
+    	.right-box-top{
+    		flex: 1;
+    		width: calc( 100% - 170rpx);
+    		padding: 0 0 20rpx 0;
+    		// 商品认证
+    		.authenticationItem{
+    			width: 100%;
+    			.authenticationItemcontent{
+    				width: 100%;
+    				background-color: #fff;
+    				border-radius: 20rpx;
+    				border: solid rgba(200,38,0,.05) 6rpx;
+    				box-shadow:2rpx 2rpx 20rpx 0rpx rgba(200,38,0,.051);
+    				padding:10rpx 20rpx;
+    				.zhushi{
+    					font-size: 24rpx;
+    					color: #999;
+    					padding: 10rpx 0;
+    					word-wrap:break-word; 
+    				}
+    				.authenticationItemcontentItem{
+    					display: flex;
+    					flex-direction: row;
+    					align-items: flex-start;
+    					justify-content: flex-start;
+    					box-sizing: border-box;
+    					padding: 12rpx 0;
+    					font-size: 26rpx;
+    					.title{
+    						width: 160rpx;
+    					}
+    					.content{
+    						text-overflow: ellipsis;
+    						width: calc( 100% - 180rpx);
+    						word-wrap:break-word; 
+    					}
+    					.img{
+    						width: 220rpx;
+    						height: 160rpx;
+    					}
+    				}
+    			}
+    		}
+    		
+    	}
+    }
+    //激活元素
+    .active{
+    	background-color: #c82626 !important;
+    }
+    // 隐藏元素
+    .none{
+    	background-color: rgba(0,0,0,0) !important;
+    }
+</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/coupon/coupon.vue

@@ -0,0 +1,292 @@
+<template>
+	<view class="Coupon">
+		<!-- 分类 -->
+		<view class="scroll-top">
+			<scroll-view class="scroll-view_H" scroll-x="true" :scroll-into-view='"nav"+selectNavId'
+				scroll-with-animation="true">
+				<view v-for="(item,index) in navList" :key="index" :id="'nav'+item.id" @click="selectNav(item.id)"
+					:class="['scroll-view-item_H',selectNavId === item.id ?'scroll-view-item_H_selected':'']">
+					{{item.name}}
+					<block v-if='index === 0'>({{count.all}})</block>
+					<block v-if='index === 1'>({{count.services}})</block>
+					<block v-if='index === 2'>({{count.reductions}})</block>
+					<block v-if='index === 3'>({{count.exchanges}})</block>
+				</view>
+			</scroll-view>
+			<scroll-view class="scroll-view_H-1" scroll-x="true" :scroll-into-view='"nav"+selectCategoryId'
+				scroll-with-animation="true">
+				<view v-for="(item,index) in categroyList" :key="index" :id="'nav'+item.id"
+					@click="selectCategory(item.id)"
+					:class="['scroll-view-item_H-1',selectCategoryId === item.id ?'scroll-view-item_H_selected-1':'']">
+					{{item.name}}
+				</view>
+			</scroll-view>
+		</view>
+
+		<!-- 有优惠券列表 -->
+		<view class="coupon-content">
+			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" :action="actions" />
+		</view>
+
+		<!-- 没有优惠券列表 -->
+		<no-list v-if="lists.length === 0" name='no-counpon' :txt="showTxt" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+
+	</view>
+</template>
+
+<script>
+	import {
+		myCoupon
+	} from '@/apis/interfaces/coupon'
+	import couponTemplate from '@/components/coupon-template/coupon-template-1'
+	export default {
+		data() {
+			return {
+				actions: {
+					name: '去使用',
+					type: 'toUsed'
+				},
+				lists:[],
+				count:{
+					all:0,
+					services:0,
+					reductions:0,
+					exchanges:0,
+				},
+				navList: [{
+						id: '',
+						name: '全部'
+					}, {
+						id: '1',
+						name: '服务券'
+					},
+					{
+						id: '2',
+						name: '代金券'
+					},
+					{
+						id: '3',
+						name: '提货券'
+					}
+				],
+				categroyList: [{
+						id: '4',
+						name: '新到'
+					},
+					{
+						id: '5',
+						name: '即将到期'
+					},
+					{
+						id: '1',
+						name: '待使用'
+					}, {
+						id: '2',
+						name: '已使用'
+					}, {
+						id: '3',
+						name: '已过期'
+					}
+				],
+				selectCategoryId: '', // 默认选择分类 默认第一个
+				selectNavId: '',
+				showTxt: '没有任何优惠券哦~',
+			};
+		},
+		components: {
+			couponTemplate
+		},
+		onLoad(e) {
+			this.getMyCoupon()
+		},
+		onShow() {
+			if (wx.getStorageSync('refresh')) {
+				this.lists = []
+				this.getMyCoupon()
+			}
+		},
+		onPullDownRefresh() {
+			this.lists = []
+			this.getMyCoupon()
+		},
+		methods: {
+			// 优惠券列表
+			getMyCoupon() {
+				let data = {
+					type: this.selectNavId
+				}
+				if(this.selectCategoryId==='4' || this.selectCategoryId==='5'){
+					data.status = ''
+					if(this.selectCategoryId === '4'){
+						data.time = 'new'
+					}else{
+						data.time = 'expire'
+					}
+				}else{
+					data.status = this.selectCategoryId
+				}
+				console.log(data)
+				myCoupon(data).then(res => {
+					console.log(res)
+					this.lists = res.lists
+					this.count = res.count
+					uni.stopPullDownRefresh()
+					wx.setStorageSync('refresh', false)
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						duration: 3000
+					})
+				})
+			},
+			// 切换商品分类
+			selectNav(id) {
+				console.log(id)
+				this.selectNavId = id
+				this.getMyCoupon()
+			},
+			selectCategory(id) {
+				console.log(id)
+				this.selectCategoryId = id
+				this.getMyCoupon()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.Coupon {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		padding-bottom: 20rpx;
+		background-color: #F7F7F7;
+
+		.coupon-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			box-sizing: border-box;
+			background-color: #fff;
+			padding: 30rpx 60rpx 0 60rpx;
+			color: #cacaca;
+
+			.nav-item {
+				padding: 20rpx 30rpx 30rpx 30rpx;
+				border-bottom: solid 4rpx #fff;
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			.nav-item-select {
+				border-bottom: solid 6rpx $main-color;
+				color: $main-color;
+			}
+		}
+
+		.scroll-top {
+			position: sticky;
+			top: 0;
+			z-index: 1000;
+
+			.scroll-view_H {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 30rpx 30rpx 0 30rpx;
+				background-color: #fff;
+
+				.scroll-view-item_H {
+					margin-right: 60rpx;
+					padding: 20rpx 0 40rpx 0;
+					// height: 100rpx;
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 28rpx;
+					border-bottom: #fff;
+					background-color: #fff;
+					transition: .1s;
+					text-align: center;
+				}
+
+				.scroll-view-item_H_selected {
+					// border-bottom: solid $main-color 4rpx;
+					color: $main-color;
+					font-weight: bold;
+					// font-size: 36rpx;
+					// transition: .3s;
+					text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+			.scroll-view_H-1 {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 0 30rpx 30rpx 30rpx;
+				background-color: #fff;
+				// position: sticky;
+				// top: 100rpx;
+				// z-index: 1000;
+
+				.scroll-view-item_H-1 {
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 24rpx;
+					border-bottom: #fff;
+					background-color: #f7f7f7;
+					margin-left: 20rpx;
+					padding: 10rpx 30rpx;
+					text-align: center;
+					border-radius: 40rpx;
+				}
+
+				.scroll-view-item_H_selected-1 {
+					// border-bottom: solid $main-color 4rpx;
+					color: #fff;
+					font-weight: bold;
+					background-image: linear-gradient(to left, $main-color, $main-color-light);
+					// font-size: 36rpx;
+					// transition: .3s;
+					// text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+		}
+
+	}
+</style>

pages/property/coupon/couponMore.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="Coupon">
+		<!-- 有优惠券列表 -->
+		<view class="coupon-content">
+			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" />
+		</view>
+
+		<!-- 没有优惠券列表 -->
+		<no-list v-if="lists.length === 0" name='no-counpon' :txt="showTxt" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+
+	</view>
+</template>
+
+<script>
+	import {
+		getCouponsListById
+	} from '@/apis/interfaces/coupon'
+	import couponTemplate from '@/components/coupon-template/coupon-template-1'
+	export default {
+		data() {
+			return {
+				lists:[],
+				id:'',
+				page:1,
+				has_more:true,
+				showTxt: '没有任何优惠券哦~'
+			};
+		},
+		components: {
+			couponTemplate
+		},
+		onLoad(e) {
+			console.log(e)
+			this.id = this.$route.query.id
+			this.getMyCoupon()
+		},
+		onShow() {
+			if (wx.getStorageSync('refresh')) {
+				this.lists = []
+				this.getMyCoupon()
+			}
+		},
+		onPullDownRefresh() {
+		  this.page = 1
+		  this.lists = []
+		  this.has_more = true
+		  this.getMyCoupon()
+		},
+		onReachBottom() {
+		  if (this.has_more) {
+		    this.page = this.page + 1
+		    this.getMyCoupon()
+		  } else {
+		    this.$refs.uToast.show({
+		      title: '吼吼吼~我是有底的~',
+		      duration: 3000
+		    })
+		  }
+		},
+		methods: {
+			getMyCoupon() {
+				let id = this.id
+				let data={
+					page:this.page,
+					pageSize:4
+				}
+				getCouponsListById(id,data).then(res => {
+					console.log(res)
+					this.lists = this.lists.concat(res.data)
+					if (res.page.has_more) {
+					  this.has_more = true
+					} else {
+					  this.has_more = false
+					}
+					uni.stopPullDownRefresh()
+					wx.setStorageSync('refresh',false)
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						duration: 3000
+					})
+					
+				})
+			},
+			// 选择顶部菜单
+			// selectNav(id) {
+			// 	console.log(typeof id)
+			// 	this.showTxt = (id === 1 ? '没有领取到任何优惠券哦~' : id === 2 ? '没有使用过任何优惠券哦~' : '没有任何过期优惠券哦~')
+			// 	if (id !== this.selectNavId) {
+			// 		this.selectNavId = id
+			// 		this.page = 1
+			// 		this.lists = []
+			// 		this.has_more = true
+			// 		this.getMyCoupon()
+			// 	}
+			// },
+			// 切换商品分类
+			selectNav(id) {
+				console.log(id)
+				this.selectNavId = id
+				this.getMyCoupon()
+				// if (this.selectCategoryId !== id) {
+				// this.goodsList = []
+				// this.has_more = true
+				// this.page = 1
+				// this.getGoodsByCompanyidCaregoryid()
+				// }
+			},
+			selectCategory(id) {
+				console.log(id)
+				this.selectCategoryId = id
+				this.getMyCoupon()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.Coupon {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+		padding-bottom: 20rpx;
+
+		.coupon-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			box-sizing: border-box;
+			background-color: #fff;
+			padding: 30rpx 60rpx 0 60rpx;
+			color: #cacaca;
+
+			.nav-item {
+				padding: 20rpx 30rpx 30rpx 30rpx;
+				border-bottom: solid 4rpx #fff;
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			.nav-item-select {
+				border-bottom: solid 6rpx $main-color;
+				color: $main-color;
+			}
+		}
+
+		.scroll-top {
+			position: sticky;
+			top: 0;
+			z-index: 1000;
+
+			.scroll-view_H {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 30rpx 30rpx 0 30rpx;
+				background-color: #fff;
+
+				.scroll-view-item_H {
+					margin-right: 60rpx;
+					padding: 20rpx 0 40rpx 0;
+					// height: 100rpx;
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 28rpx;
+					border-bottom: #fff;
+					background-color: #fff;
+					transition: .1s;
+					text-align: center;
+				}
+
+				.scroll-view-item_H_selected {
+					// border-bottom: solid $main-color 4rpx;
+					color: $main-color;
+					font-weight: bold;
+					// font-size: 36rpx;
+					// transition: .3s;
+					text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+			.scroll-view_H-1 {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 0 30rpx 30rpx 30rpx;
+				background-color: #fff;
+				// position: sticky;
+				// top: 100rpx;
+				// z-index: 1000;
+
+				.scroll-view-item_H-1 {
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 24rpx;
+					border-bottom: #fff;
+					background-color: #f7f7f7;
+					margin-left: 20rpx;
+					padding: 10rpx 30rpx;
+					text-align: center;
+					border-radius: 40rpx;
+				}
+
+				.scroll-view-item_H_selected-1 {
+					// border-bottom: solid $main-color 4rpx;
+					color: #fff;
+					font-weight: bold;
+					background-image: linear-gradient(to left, $main-color, $main-color-light);
+					// font-size: 36rpx;
+					// transition: .3s;
+					// text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+		}
+
+	}
+</style>

pages/property/coupon/detail.vue

@@ -0,0 +1,370 @@
+<template>
+	<view class="couponDetail" v-if="loaded">
+		<!-- 优惠券信息 -->
+		<view class="coupon">
+			<view class="coupon-title">{{info.title}}</view>
+			<view class="coupon-des" v-if="info.type.value === 2">{{info.price_text}}</view>
+			<view class="coupon-date">有效期:{{info.time.interval}}</view>
+			<view class="coupon-date">{{info.way}} {{info.whole}} </view>
+		</view>
+
+		<!-- 可用商品 -->
+		<view class="goods-title" v-if="info.goods.length>0">可用商品 <span
+				style='font-size: 24rpx;color:gray;'>（多选一）</span></view>
+		<view class="goods-item" v-if="info.goods.length>0" v-for="(item,index) in info.goods" :key='index'>
+			<image :src="item.cover" mode="aspectFill" class="goods-img" @click="$router.push({name:'goodsDetails',query:{id:item.goods_id}})" />
+			<view class="goods-right">
+				<view class="goods-right-title ellipsis-2" @click="$router.push({name:'goodsDetails',query:{id:item.goods_id}})">{{item.name}}</view>
+				<view class="goods-right-bottom">
+					<span class='money'>￥{{item.price}}</span>
+					<view class="used" v-if='info.use_way.value=== 1' @click="nowBuy(item)">立即购买</view>
+					<!-- <view class="used" v-else @click="clickCode(coupon_grant_id,item.goods_sku_id)">查看兑换码</view> -->
+				</view>
+			</view>
+		</view>
+		<!-- 描述 -->
+		<view class="describe" v-if="contentArr.length>0">
+			<view class="goods-title">使用须知</view>
+			<view class="describe-des" v-for="(item,index) in contentArr" :key='index'>
+				{{item}}
+			</view>
+		</view>
+
+		<view class="clickCodeBtn" v-if='info.use_way.value=== 2' @click="clickCode(coupon_grant_id)">立即兑换</view>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+
+		<!-- 二维码弹窗 -->
+		<view class="showCode " v-if="showCode">
+			<view class="showCodeBg" @click="showCode = false"></view>
+			<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
+				<view class="showCodeTitle">商品兑换码</view>
+				<image :src="code" mode="widthFix"></image>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getCouponsInfoById,
+		getQrcodeByGrantId
+	} from '@/apis/interfaces/coupon'
+	import GoodTemplate from '@/components/goods-template/goods-template'
+	export default {
+		data() {
+			return {
+				coupon_grant_id: '',
+				code: '',
+				showCode: false,
+				loaded:false,
+				info: {},
+				contentArr: [],
+			};
+		},
+		components: {
+			GoodTemplate
+		},
+		onLoad(e) {
+			console.log(this.$route)
+			this.coupon_grant_id = this.$route.query.id
+			this.getList()
+		},
+		methods: {
+			// 获取列表
+			getList() {
+				getCouponsInfoById(this.coupon_grant_id).then(res => {
+					this.info = res
+					this.contentArr = res.description.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').split('<br/>')
+					this.loaded = true
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						duration: 3000
+					})
+				})
+			},
+			// 点击立即购买去商品确认页面
+			nowBuy(items) {
+				console.log(items, 'items....')
+				let data = {
+					skuId: items.goods_sku_id,
+					qty: 1
+				}
+				this.$router.push({
+					name: 'Buy',
+					params: data
+				})
+				console.log(data)
+			},
+			// 点击二维码特效
+			clickCode(grantid) {
+				this.code = ''
+				if (grantid !== '') {
+					let data = {
+						coupon_grant_id: grantid
+					}
+					getQrcodeByGrantId(data).then(res => {
+						console.log(res)
+						this.code = res.code
+						this.showCode = !this.showCode
+					}).catch(err => {
+						this.$refs.uToast.show({
+							title: err.message,
+							duration: 3000
+						})
+					})
+				}
+			},
+			// 代金券立即购买
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	// page{
+	// 	width: 100%;
+	// 	height: 100%;
+	// 	padding-bottom: 120rpx;
+	// }
+	.clickCodeBtn {
+		background-color: $main-color;
+		color: #fff;
+		font-size: 30rpx;
+		font-weight: bold;
+		padding: 30rpx 0;
+		text-align: center;
+		border-radius: 30rpx;
+		width: 90%;
+		margin-left: 5%;
+		position: fixed;
+		bottom: 20rpx;
+	}
+
+	.couponDetail {
+		padding-bottom: 20rpx;
+		background-color: #f7f7f7;
+		min-height: 100vh;
+		padding-top: $margin;
+		position: relative;
+		padding-bottom: 120rpx;
+
+		// 优惠券
+		.coupon {
+			margin: 0 $margin * 2;
+			background-color: #Fff;
+			position: relative;
+			z-index: 1;
+			color: #333;
+			padding: 30rpx 20rpx;
+			box-shadow: 0 10rpx 20rpx 10rpx rgba($color: #000000, $alpha: .1);
+			border-radius: 20rpx;
+
+			.coupon-title {
+				width: 100%;
+				font-size: 34rpx;
+			}
+
+			.coupon-des {
+				color: $main-color;
+				font-size: 32rpx;
+				padding: 16rpx 0;
+			}
+
+			.coupon-date {
+				color: #999;
+				font-size: 28rpx;
+				margin-top: 10rpx;
+			}
+		}
+
+		// 可用商品
+		.goods-item {
+			background-color: #fff;
+			margin: $margin*1.5 $margin * 2;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			padding: $padding;
+			box-shadow: 0 10rpx 20rpx 10rpx rgba($color: #000000, $alpha: .1);
+
+			.goods-img {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 10rpx;
+			}
+
+			.goods-right {
+				margin-left: 30rpx;
+				width: calc(100% - 200rpx);
+
+				.goods-right-title {
+					font-size: 30rpx;
+					font-weight: 400;
+				}
+
+				.goods-right-bottom {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					box-sizing: border-box;
+					margin-top: 20rpx;
+
+					.money {
+						font-size: 32rpx;
+						font-weight: 500;
+						color: $main-color;
+					}
+
+					.used {
+						background-image: linear-gradient(to left, $main-color, $main-color-light);
+						padding: 10rpx 20rpx;
+						border-radius: 20rpx;
+						color: #fff;
+						font-size: 26rpx;
+
+					}
+				}
+			}
+		}
+
+		.goods-title {
+			font-size: 34rpx;
+			font-weight: bold;
+			text-align: left;
+			margin: $margin*2;
+			// text-shadow:10rpx 10rpx linear-gradient(to right, #f39e17, #f85b05);
+			text-shadow: 2rpx 2rpx 10rpx $main-color;
+		}
+
+		// 描述
+		.describe {
+			margin: $margin * 2 0;
+
+			.describe-des {
+				color: #999;
+				padding: 10rpx $margin * 2;
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	// 动画效果
+	.showCode {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 199999999999999993;
+
+		.showCodeBg {
+			background-color: rgba($color:#000, $alpha: 0.3);
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 199999999999999994;
+		}
+
+		.showCodeContentSelect {
+			animation: sk-foldCubeAngle .6s linear both;
+		}
+
+		.showCodeContentSelectNo {
+			animation: sk-foldCubeAngleNo .6s linear both;
+		}
+
+		.showCodeContent {
+			width: 600rpx;
+			height: 500rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			padding: 30rpx;
+			position: relative;
+			z-index: 199999999999999995;
+
+			image {
+				width: 60%;
+			}
+
+			.showCodeTitle {
+				font-weight: 600;
+				padding-bottom: 40rpx;
+				font-size: 36rpx;
+			}
+		}
+	}
+
+
+
+
+
+	@keyframes sk-foldCubeAngle {
+		0% {
+			-webkit-transform: perspective(140px) rotateX(-180deg);
+			transform: perspective(140px) rotateX(-180deg);
+			opacity: 0;
+		}
+
+		100% {
+			-webkit-transform: perspective(140px) rotateX(0deg);
+			transform: perspective(140px) rotateX(0deg);
+			opacity: 1;
+		}
+	}
+
+	@keyframes sk-foldCubeAngleNo {
+		0% {
+			transform: scale(1);
+			opacity: 1;
+		}
+
+		25% {
+			transform: scale(0);
+			opacity: 0;
+		}
+	}
+
+	@keyframes turn {
+		0% {
+			-webkit-transform: rotate(0deg);
+			opacity: 1;
+		}
+
+		25% {
+			-webkit-transform: rotate(90deg);
+			opacity: .9;
+		}
+
+		50% {
+			-webkit-transform: rotate(180deg);
+			opacity: .8;
+		}
+
+		75% {
+			-webkit-transform: rotate(270deg);
+			opacity: .9;
+		}
+
+		100% {
+			-webkit-transform: rotate(360deg);
+			opacity: 1;
+		}
+	}
+</style>

pages/property/index.vue

@@ -58,23 +58,23 @@
 			</view>
 			<!-- 我的权证 -->
 			<view class="user-group">
-				<view class="title">
+				<view class="title" >
 					<view class="title-text">我的权证</view>
 				</view>
 				<view class="group-flex group-flex-4">
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'NumberWeight'})">
 						<view class="item-num">0</view>
 						<view class="item-title">权证持有</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'33'})">
 						<view class="item-num">0</view>
 						<view class="item-title">权证转让</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'334'})">
 						<view class="item-num">0</view>
 						<view class="item-title">已使用</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'MallShipments'})">
 						<view class="item-num">0</view>
 						<view class="item-title">已提货</view>
 					</view>
@@ -91,7 +91,7 @@
 						<image class="item-cover" src="@/static/icons/user_icon_02.png" mode="aspectFill" />
 						<view class="item-title">关注企业</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'CouponList'})">
 						<image class="item-cover" src="@/static/icons/user_icon_03.png" mode="aspectFill" />
 						<view class="item-title">我的优惠券</view>
 					</view>
@@ -144,6 +144,11 @@
 			<!-- 推广海报 -->
             <view class="poster-text">推广海报</view>
 			<carousel :img-list="imgList" url-key="url" @selected="selectedBanner"/>
+            
+            
+            <view class="" @click="outLogin">
+                临时退出
+            </view>
 		</block>
 		<!-- 版权信息 -->
 		<view class="copyright">易品新境 beta 1.0.0</view>

pages/property/order/logistics.vue

@@ -0,0 +1,174 @@
+<template>
+	<view class="LogisticsIndex">
+		<block v-if="list.length>0">
+			<view class="logistics-top">
+				<view>{{express.express_name}} <span class="copy" @click='copy(express.express_no)'>复制单号</span></view>
+				<view><span>快递编号</span>：{{express.express_no}} </view>
+			</view>
+			<view class="Logistics-content">
+				<view>物流追踪</view>
+				<view class="list">
+					<view class="list-item" v-for="(item,index) in list" :key='index'>
+						<view :class="['dian',index === 0 ?'dian-active':'']"></view>
+						<view :class="['content',index === 0?'content-active':'']">
+							<view class=""><span style='padding-right: 10rpx;'>{{item.status}} - </span>{{item.context}}
+							</view>
+							<view class="date"> {{item.time}} </view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+
+		<!-- 没有订单列表 -->
+		<no-list v-if="list.length === 0" name='no-addr' txt="暂无任务物流进度信息~" />
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+<script>
+	import {
+		mallShipmentsLogistic
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		data() {
+			return {
+				list: [],
+				no: '', // 快递单号
+				express:{},// 地址信息
+			}
+		},
+		onLoad(e) {
+			this.no = this.$route.params.no
+			this.getLogistic(this.no)
+		},
+		methods: {
+			getLogistic(no) {
+				mallShipmentsLogistic(no).then(res => {
+					console.log(res)
+					this.list = res.logistics
+					this.express = res.express
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',icon:false,
+						duration: 3000
+					})
+				})
+			},
+			// 复制
+			copy(no) {
+				uni.setClipboardData({
+					data: no,
+					success: res=>{
+						console.log('success');
+						console.log(res)
+					}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.LogisticsIndex {
+		font-size: $title-size;
+		color: #333;
+		margin-top: 20rpx;
+
+		// 物流名称
+		.logistics-top {
+			background-color: #fff;
+			padding: 30rpx 50rpx;
+			margin-bottom: 20rpx;
+
+			view:nth-child(2) {
+				padding-top: $padding * 0.5;
+				font-size: 0.9*$title-size;
+			}
+
+			.copy {
+				display: inline-block;
+				padding: $padding *0.4 $padding;
+				background-color: $main-color;
+				margin-left: 30rpx;
+				color: #fff;
+				font-size: $title-size *0.8;
+				border-radius: 6rpx;
+			}
+		}
+
+		// 物流进度
+		.Logistics-content {
+			background-color: #fff;
+			padding: 30rpx 50rpx;
+			margin: 50rpx 0;
+
+			.list {
+				margin-top: $margin*2;
+				margin-left: 20rpx;
+
+				.list-item {
+					display: flex;
+					flex-direction: row;
+					justify-content: flex-start;
+					align-items: flex-start;
+					box-sizing: border-box;
+					position: relative;
+					border-left: solid 2rpx #cacaca;
+					padding-bottom: $margin*1.6;
+
+					&:last-child {
+						border-left: solid 2rpx #fff !important;
+					}
+
+					&:first-child {
+						color: $main-color !important;
+					}
+
+					.dian {
+						width: 20rpx;
+						height: 20rpx;
+						border-radius: 50%;
+						background-color: #cacaca;
+						border: solid 10rpx rgba($color:#cacaca, $alpha: 0.3);
+						position: relative;
+						left: -11rpx;
+					}
+
+					.dian-active {
+						background-color: $main-color;
+						width: 30rpx;
+						height: 30rpx;
+						left: -16rpx;
+						border: solid 10rpx rgba($color: $main-color, $alpha: 0.3);
+						box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.5);
+					}
+
+					.content {
+						flex: 1;
+						margin-left: 60rpx;
+						// padding: 10rpx 0;
+						font-size: $title-size * 0.9;
+						color: #666;
+						position: relative;
+						top: -10rpx;
+
+						.date {
+							margin-top: $margin;
+						}
+					}
+
+					.content-active {
+						color: $main-color;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/property/order/mallRefund.vue

@@ -0,0 +1,326 @@
+<template>
+  <view class="NumberWeight">
+	  <!-- 订单分类 -->
+	  <scroll-view class="nav" scroll-x="true" :scroll-into-view='selectCategoryId'	scroll-with-animation="true">
+	    <view :class="['nav-item' ,selectNavId === item.id?'nav-item-selected':'']" v-for="(item,index) in navList"
+	      :key="index" @click="selectNav(item.id)">
+		  {{item.name}}
+		  {{item.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+		  {{item.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+		  {{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+		  {{item.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+		  {{item.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+		  {{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+		</view>
+	  </scroll-view>
+	  
+    <!-- 有订单列表 -->
+    <view class="" v-if="lists.length > 0">
+      <!-- 订单列表 -->
+      <view class="order-list" v-for="(item,index) in lists" :key="index">
+        <MallRefundsTemplate :item="item" />
+        <view class="actions">
+          <view @click="goDetail(item.refund_id)" class="nowPay">查看详情</view>
+        </view>
+      </view>
+    </view>
+    <!-- 没有订单列表 -->
+    <no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+	
+	<!-- <u-toast ref="uToast" /> -->
+	<u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import {
+    MallRefundsTemplate
+  } from '@/components/mall-refunds-template/mall-refunds-template'
+  import { mallRefunds } from '@/apis/interfaces/numberWeight'
+  export default {
+    components: {
+      MallRefundsTemplate
+    },
+    data() {
+      return {
+        lists: [],
+		page:1,
+		total:0,
+		navList: [{
+		    name: '待审核',
+		    id: 'apply'
+		  },{
+		    name: '待返货',
+		    id: 'deliver'
+		  },{
+		    name: '待签收',
+		    id: 'delivered'
+		  },{
+		    name: '已签收',
+		    id: 'signed'
+		  },
+		  {
+		    name: '待退数权',
+		    id: 'process'
+		  },
+		  {
+		    name: '完成退货',
+		    id: 'completed'
+		  }
+		],
+		selectNavId: 'apply',
+		count:{}
+      };
+    },
+	onLoad() {
+		this.getList()
+	},
+	onShow(){
+		console.log(uni.getStorageSync('refresh'),'getStorageSync')
+		if(uni.getStorageSync('refresh')){
+			this.reset()
+		}
+	},
+	onUnload() {
+		uni.setStorageSync('refresh',false)
+	},
+	onReachBottom() {
+		if(this.total>this.lists.length){
+			this.page = this.page + 1
+			this.getList()
+		}else{
+			this.$refs.uToast.show({
+			  title: '吼吼吼~我是有底的~',
+			  type: 'error',icon:false,
+			  duration: 3000
+			})
+		}
+	},
+    methods: {
+		reset(){
+			this.page =1
+			this.total = 0
+			this.lists = []
+			this.getList()
+			uni.setStorageSync('refresh',false)
+		},
+		// 选择订单
+		selectNav(id) {
+		  if (this.selectNavId !== id) {
+		    this.selectNavId = id
+			this.reset()
+		  }
+		},
+		// 获取订单列表
+		getList(){
+			let data = {
+				pageSize:20,
+				page:this.page,
+				state:this.selectNavId
+			}
+			mallRefunds(data).then(res=>{
+				console.log(res)
+				this.count = res.count
+				this.lists = this.lists.concat(res.lists.data)
+				this.total = res.lists.page.total
+			}).catch(err=>{
+				this.$refs.uToast.show({
+				  title: err.message,
+				  type: 'error',icon:false,
+				  duration: 3000
+				})
+			})
+		},
+		// 取消提货单
+		nowCancel(index,no){
+			console.log(index,no)
+			uni.showModal({
+			    title: '哎呦，提醒你',
+			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    success:  (res) =>{
+			        if (res.confirm) {
+			            mallShipmentsCancel(no).then(res=>{
+			            	console.log(res)
+							this.$refs.uToast.show({
+							  title:res,
+							  type: 'error',icon:false,
+							  duration: 3000
+							})
+			            	this.lists.splice(index,1)
+			            	this.total = this.total - 1
+			            }).catch(err=>{
+			            	this.$refs.uToast.show({
+			            	  title: err.message,
+			            	  type: 'error',icon:false,
+			            	  duration: 3000
+			            	})
+			            })
+			        } else if (res.cancel) {
+						this.$refs.uToast.show({
+						  title:'放弃了~',
+						  type: 'error',icon:false,
+						  duration: 3000
+						})
+			        }
+			    }
+			});
+		
+		},
+		// 签收提货单
+		nowSign(index,no){
+			console.log(index,no)
+			uni.showModal({
+			    title: '哎呦，提醒你',
+			    content: '是否确认已经收到商品了呀',
+			    success:  (res) =>{
+			        if (res.confirm) {
+						console.log(no)
+			            mallShipmentsSign(no).then(res=>{
+			            	console.log(res)
+							this.$refs.uToast.show({
+							  title:res,
+							  type: 'error',icon:false,
+							  duration: 3000
+							})
+			            	this.lists.splice(index,1)
+			            	this.total = this.total - 1
+			            }).catch(err=>{
+			            	this.$refs.uToast.show({
+			            	  title: err.message,
+			            	  type: 'error',icon:false,
+			            	  duration: 3000
+			            	})
+			            })
+			        
+					} else if (res.cancel) {
+						this.$refs.uToast.show({
+						  title:'放弃了~',
+						  type: 'error',icon:false,
+						  duration: 3000
+						})
+			        }
+			    }
+			});
+		},
+		
+		// 查看详情
+		goDetail(no){
+			this.$router.push({
+			  name: 'MallRefundsInfo',
+			  params:{
+				  no:no
+			  }
+			})
+		}
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    width: 100%;
+    height: 100%;
+  }
+
+  .NumberWeight {
+    width: 100%;
+    min-height: 100vh;
+    box-sizing: border-box;
+    background-color: #F7F7F7;
+
+    // 订单nav
+    .nav {
+	  display: flex;
+	  flex-direction: row;
+	  align-items: center;
+	  justify-content: flex-start;
+	  box-sizing: border-box;
+	  white-space: nowrap;
+      font-size: $title-size*0.95;
+      padding: 0 30rpx;
+      background-color: #fff;
+      color: #666;
+      border-top: solid 20rpx #f7f7f7;
+	  position: sticky;
+	  top: 0rpx;
+	  z-index: 1;
+
+      .nav-item {
+	    display: inline-block;
+        border-bottom: solid 4rpx #fff;
+        padding: 30rpx 10rpx;
+		margin-right: 10rpx;
+      }
+
+      .nav-item-selected {
+        border-bottom: solid 4rpx $main-color;
+        color: $main-color;
+      }
+    }
+
+    // 订单列表
+    .order-list {
+      background-color: #fff;
+      border-radius: 20rpx;
+      min-height: 300rpx;
+      margin: 30rpx 20rpx 0 20rpx;
+      padding:30rpx 30rpx 20rpx 30rpx ;
+	  // border-top: solid 4rpx #cacaca;
+
+      // 操作信息
+      .actions {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-end;
+        box-sizing: border-box;
+        flex-wrap: wrap;
+        flex: 1;
+        font-size: 28rpx;
+        color: #fff;
+		border-top: solid 1rpx #EFF4F2;
+        .nowPay {
+          padding: 4rpx 20rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          // background-color: $main-color;
+		  color: #999;
+		  border:solid 1rpx #cacaca;
+        }
+
+        .cancelOrder {
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          background-color: #DD524D;
+        }
+
+        .logistics {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .sign {
+          background-color: #DD524D;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .evaluate {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+      }
+    }
+  }
+</style>

pages/property/order/mallRefundsInfo.vue

@@ -0,0 +1,720 @@
+<template>
+	<view class="OrderInfo">
+		<!-- 订单状态 -->
+		<view class="order-status">
+			<view class="info">
+				{{info.state.text}}
+				<span>{{info.state.remark}}</span>
+			</view>
+			<image src="/static/imgs/fire.png" mode="widthFix"></image>
+		</view>
+		<!-- 收货人 -->
+		<view class="acceptInfo" v-if="type === '2'">
+			<block>
+				<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
+				<view class="address">
+					<u-icon name="map" color="red"></u-icon>
+					<span>{{address.full_address}}</span>
+				</view>
+			</block>
+		</view>
+
+		<view class="goods-info1">
+			<view class="top">
+				<view class="company">
+					<view class="company-logo">
+						<image :src="info.shop.cover" mode="aspectFill" />
+						<view class="name ellipsis">{{info.shop.name}}</view>
+					</view>
+					<view class="flexrow">
+						<view class="no ellipsis">退后单号： {{info.refund_no}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="goods-info">
+				<image class="goods-img" :src="info.goods_sku.cover" mode="aspectFill" />
+				<view class="goods">
+					<view class="name">
+						<view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view>
+						<!-- <span>￥16.80</span> -->
+					</view>
+					<view class="sku">数权个数 <span>x {{info.qty}}</span> </view>
+				</view>
+			</view>
+			<navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>
+				<view class="total-btn">再次购买</view>
+			</navigator>
+			<view class="goods-type">创建退货时间 <span>{{info.created_at}}</span></view>
+			<view class="goods-type">运费 <span>自行承担运费</span></view>
+			<view class="goods-type">退货数量 <span>
+					<u-number-box v-model="info.qty" :disabled="true"></u-number-box>
+				</span></view>
+			<view class="goods-type">退货方式<span>快递退回</span></view>
+			<block v-if="info.can.user_deliver">
+				<view class="goods-type-1">物流公司
+					<u-input v-model="company" placeholder='请输入退货物流公司' />
+				</view>
+				<view class="goods-type-1">物流单号
+					<u-input v-model="number" placeholder='请输入物流单号' />
+				</view>
+			</block>
+		</view>
+		<!-- 操作相关 -->
+		<view class="actions">
+			<view @click="showLogs = true" class="nowPay">查看退货日志</view>
+			<view v-if="info.can.user_deliver" @click="nowRefunds(refund_id)" class="nowPay">确认退货</view>
+		</view>
+		<!-- 显示 -->
+		<u-popup v-model="showLogs" mode="bottom" border-radius="14">
+			<scroll-view scroll-y="true" style="height: 1000rpx;" class="scrollView" v-if="logs.length>0">
+				<view class="coupon-title">退货操作进度 </view>
+				<view class="list">
+					<view class="list-item" v-for="(item,index) in logs" :key='index'>
+						<view :class="['dian',index === 0 ?'dian-active':'']"></view>
+						<view :class="['content',index === 0?'content-active':'']">
+							<view class="title">{{item.state_text?item.state_text:'当前状态不明确，需后台返回'}}</view>
+							<view class="des">退货原因：{{item.title || '无理由'}} ； 退货备注：{{item.remark || '无备注'}}</view>
+							<view class="pictures">
+								<image @click="priveImg(index,idx)" v-for="(it,idx) in item.pictures" :key='idx' :src="it" mode="aspectFill"  />
+							</view>
+							<view class="date"> {{item.created_at}} </view>
+						</view>
+					</view>
+				</view>
+				<!-- 没有优惠券列表 -->
+				<no-list v-if="logs.length === 0" name='no-news' txt="没有任何退货进度信息哦~" />
+			</scroll-view>
+		</u-popup>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		mallRefundsInfo,
+		mallRefundsDeliver
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		name: 'OrderInfo',
+		data() {
+			return {
+				info: {},
+				qty: 1,
+				refund_id: '', // 退货单no
+				company: '',
+				number: '',
+				logs: [],
+				showLogs: false // 默认不显示记录信息
+			};
+		},
+		onLoad(e) {
+			this.refund_id = this.$route.params.no
+			this.getInfo(this.refund_id)
+		},
+		onShow() {
+			if (uni.getStorageSync('refresh')) {
+				this.getInfo(this.refund_id)
+			}
+		},
+		methods: {
+			// 获取退货的基本信息
+			getInfo(refund_id) {
+				mallRefundsInfo(refund_id).then(res => {
+					this.info = res
+					this.logs = res.log
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',icon:false,
+						duration: 3000
+					})
+				})
+			},
+			priveImg(index,idx){
+				console.log(this.logs[index].pictures);
+				uni.previewImage({
+					current:idx,
+					urls:this.logs[index].pictures
+				})
+			},
+			// 确认退货
+			nowRefunds(no) {
+				let data = {
+					refund: this.refund_id,
+					company: this.company,
+					number: this.number,
+				}
+				if (data.company === '') {
+					this.$refs.uToast.show({
+						title: '请核对物流公司名称',
+						type: 'error',icon:false,
+						duration: 3000
+					})
+					return;
+				}
+				if (data.number === '') {
+					this.$refs.uToast.show({
+						title: '请核对物流单号',
+						type: 'error',icon:false,
+						duration: 3000
+					})
+					return;
+				}
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确退货信息准确无误呀',
+					success: (res) => {
+						if (res.confirm) {
+							mallRefundsDeliver(data).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',icon:false,
+									duration: 3000
+								})
+								this.getInfo(data.refund)
+								uni.setStorageSync('refresh', true)
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',icon:false,
+									duration: 3000
+								})
+							})
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',icon:false,
+								duration: 3000
+							})
+						}
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100%;
+		height: 100%;
+	}
+
+	.OrderInfo {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+		padding-bottom: 80rpx;
+
+		.order-status {
+			width: 100%;
+			height: 300rpx;
+			background-image: linear-gradient(to bottom, $main-color, $main-color-light);
+			color: #Fff;
+			font-size: 36rpx;
+			padding: 30rpx 50rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+			.info {
+				font-size: 36rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
+
+				span {
+					font-size: 28rpx;
+					padding-top: 30rpx;
+				}
+			}
+
+			image {
+				width: 200rpx;
+			}
+		}
+
+		.acceptInfo {
+			margin: 0 30rpx;
+			background-color: #fff;
+			box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
+			border-radius: 20rpx;
+			padding: 30rpx;
+			position: relative;
+			top: -30rpx;
+
+			.name {
+				font-size: 36rpx;
+				font-weight: 600;
+
+				span {
+					padding-left: 20rpx;
+					font-size: 30rpx;
+				}
+			}
+
+			.address {
+				padding-top: 20rpx;
+				font-size: 28rpx;
+
+				span {
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		.goods-info1 {
+			padding: 20rpx 40rpx;
+			background-color: #fff;
+
+			.goods-type {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+			}
+
+			.goods-type-1 {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+
+				u-input {
+					flex: 1;
+					margin-left: 50rpx;
+				}
+			}
+
+			.goods-type-address {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+
+				u-icon {
+					padding-left: 20rpx;
+				}
+			}
+
+			// 顶部信息
+			.top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #EFF4F2;
+
+				.company-logo {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+
+					.name {
+						width: 600rpx;
+						font-size: 30rpx;
+						color: #484848;
+						font-weight: bold;
+					}
+				}
+
+
+				.no {
+					margin-top: 16rpx;
+					font-size: $title-size*0.8;
+					color: #999;
+					// width: 500rpx;
+				}
+
+				.status {
+					color: #999;
+					font-size: $title-size;
+				}
+			}
+
+			// 商品信息
+			.goods-info {
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				margin-top: 40rpx;
+
+				.goods-img {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 10rpx;
+				}
+
+				.goods {
+					flex: 1;
+					margin-left: 20rpx;
+
+
+					.name {
+						width: 100%;
+						display: flex;
+						flex-direction: row;
+						align-items: flex-start;
+						justify-content: space-between;
+						box-sizing: border-box;
+						font-size: 30rpx;
+						// font-weight: bold;
+
+						.name1 {
+							width: 500rpx;
+						}
+
+						span {
+							font-size: 34rpx;
+							font-weight: normal;
+						}
+					}
+
+					.sku {
+						flex: 1;
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						justify-content: space-between;
+						box-sizing: border-box;
+						margin-top: 10rpx;
+						font-size: 28rpx;
+						color: #999;
+					}
+				}
+			}
+
+			// 合计信息
+			.total {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: $main-color;
+				flex: 1;
+				text-align: right;
+				margin-top: 20rpx;
+				padding-bottom: 30rpx;
+			}
+
+			.total-btn {
+				border: solid 1rpx $main-color;
+				padding: 6rpx 20rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		// 操作信息
+		.actions {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-end;
+			box-sizing: border-box;
+			flex-wrap: wrap;
+			background-color: #fff;
+			flex: 1;
+			font-size: 28rpx;
+			padding: 20rpx 50rpx 30rpx 50rpx;
+			color: #fff;
+
+			.nowPay {
+				padding: 4rpx 20rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				// background-color: $main-color;
+				color: #999;
+				border: solid 1rpx #cacaca;
+			}
+
+			.cancelOrder {
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				background-color: #DD524D;
+			}
+
+			.logistics {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.sign {
+				background-color: #DD524D;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.evaluate {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+		}
+
+	}
+
+	.flexrow {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		width: 100%;
+
+		.copy {
+			color: $main-color;
+			font-size: $title-size*0.8;
+			font-weight: 400;
+			padding: 0 30rpx;
+		}
+	}
+
+	.no-address {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+	// 优惠券弹窗
+	.scrollView {
+		// padding: 40rpx;
+		box-sizing: border-box;
+		position: relative;
+
+		// 标题
+		.coupon-title {
+			padding: 40rpx;
+			font-weight: bold;
+			font-size: 40rpx;
+			border-bottom: solid 1rpx #f7f7f7;
+		}
+
+		// 优惠券样式
+		.coupon-list-item {
+			border-bottom: solid 1rpx #f7f7f7;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			position: relative;
+			width: 100%;
+			padding: 20rpx 50rpx;
+
+			.coupon-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				padding-top: 10rpx;
+			}
+		}
+	}
+
+	.list-top1 {
+		display: flex;
+		flex-direction: row;
+		align-items: flex-start;
+		justify-content: space-between;
+		box-sizing: border-box;
+		font-size: $title-size*0.94;
+		width: 100%;
+		margin-left: 0 !important;
+		margin-top: 30rpx;
+
+		.shop-info {
+			margin-left: 20rpx;
+		}
+
+		.list-top1-img {
+			width: 170rpx;
+			height: 170rpx;
+			border-radius: 10rpx;
+		}
+
+		.des {
+			font-size: 28rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+		}
+	}
+
+	.list-top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 30rpx 0;
+		font-size: $title-size*0.94;
+		border-bottom: solid 1rpx #f7f7f7;
+		width: 600rpx;
+		margin-left: 30rpx;
+
+		.list-top-left {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+
+			.shop-info {
+				flex: 1;
+			}
+
+			.title {
+				width: 380rpx;
+				font-size: $title-size*1;
+				font-weight: 400;
+			}
+
+			.urate {
+				padding: 10rpx 0;
+			}
+
+			.des {
+				// padding-top: $padding*0.8;
+				font-size: $title-size * 0.8;
+				color: #999;
+
+				span {
+					color: #666;
+					padding: 0 10rpx;
+				}
+			}
+
+			.list-banner {
+				width: 120rpx;
+				margin-right: $margin*1.5;
+				height: 120rpx;
+				border-radius: 4rpx;
+			}
+		}
+
+		.list-top-right {
+			border: solid 1rpx $main-color;
+			color: $main-color;
+			display: inline-block;
+			padding: 8rpx 16rpx;
+			font-size: $title-size *0.8;
+			border-radius: 4rpx;
+		}
+	}
+
+	.list {
+		margin-top: $margin*2;
+		margin-left: 20rpx;
+		padding: 30rpx 50rpx;
+
+		.list-item {
+			display: flex;
+			flex-direction: row;
+			justify-content: flex-start;
+			align-items: flex-start;
+			box-sizing: border-box;
+			position: relative;
+			border-left: solid 2rpx #cacaca;
+			padding-bottom: $margin*1.6;
+
+			&:last-child {
+				border-left: solid 2rpx #fff !important;
+			}
+
+			&:first-child {
+				color: $main-color !important;
+			}
+
+			.dian {
+				width: 20rpx;
+				height: 20rpx;
+				border-radius: 50%;
+				background-color: #cacaca;
+				border: solid 10rpx rgba($color:#cacaca, $alpha: 0.3);
+				position: relative;
+				left: -11rpx;
+			}
+
+			.dian-active {
+				background-color: $main-color;
+				width: 30rpx;
+				height: 30rpx;
+				left: -16rpx;
+				border: solid 10rpx rgba($color: $main-color, $alpha: 0.3);
+				box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.5);
+			}
+
+			.content {
+				flex: 1;
+				margin-left: 60rpx;
+				// padding: 10rpx 0;
+				font-size: $title-size * 0.9;
+				color: #666;
+				position: relative;
+				top: -10rpx;
+
+				.date {
+					margin-top: $margin;
+				}
+			}
+
+			.content-active {
+				color: $main-color;
+			}
+			
+			.pictures{
+				width: 100%;
+				image{
+					width: 160rpx;
+					height: 160rpx;
+					margin: 8rpx;
+					border-radius: 2rpx;
+				}
+			}
+		}
+	}
+</style>

pages/property/order/mallShipments.vue

@@ -0,0 +1,486 @@
+<template>
+	<view class="NumberWeight">
+		<!-- 订单分类 -->
+		<view class="nav">
+			<view :class="['nav-item' ,selectTypeId === item.id?'nav-item-selected':'']"
+				v-for="(item,index) in typeList" :key="index" @click="selectType(item.id,index)">
+				{{item.name}}
+				{{item.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+				{{item.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+				{{item.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+				{{item.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+			</view>
+		</view>
+		<!-- 快递点  自提单显示 -->
+		<scroll-view class="nav1" v-if='selectTypeIndex === 0 || selectTypeIndex === 1' scroll-x="true"	scroll-with-animation="true">
+			<view :class="['nav-item' ,state === it.id?'nav-item-selected':'']" v-for="(it,idx) in typeList[selectTypeIndex].categrery"
+				:key="idx" @click="selectNav(it.id)">
+				{{it.name}}
+				{{it.id ==='signed' && count.signed >0 ? '('+count.signed + ')':''}}
+				{{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+				{{it.id ==='init' && count.init >0 ?'('+count.init + ')':''}}
+				{{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+			</view>
+		</scroll-view>
+		<!--退货单 -->
+		<scroll-view class="nav1" v-else scroll-x="true" scroll-with-animation="true">
+			<view :class="['nav-item' ,state === it.id?'nav-item-selected':'']" v-for="(it,idx) in typeList[selectTypeIndex].categrery"
+				:key="idx" @click="selectNav(it.id)">
+				{{it.name}}
+				{{it.id ==='apply' && count.apply >0 ? '('+count.apply + ')':''}}
+				{{it.id ==='deliver' && count.deliver >0 ?'('+count.deliver + ')':''}}
+				{{it.id ==='delivered' && count.delivered >0 ?'('+count.delivered + ')':''}}
+				{{it.id ==='signed' && count.signed >0 ?'('+count.signed + ')':''}}
+				{{it.id ==='process' && count.process >0 ?'('+count.process + ')':''}}
+				{{it.id ==='completed' && count.completed >0 ?'('+count.completed + ')':''}}
+			</view>
+		</scroll-view>
+
+		<!-- 有订单列表 -->
+		<block v-if="lists.length > 0">
+			<!-- 订单列表 -->
+			<view class="order-list" v-for="(item,index) in lists" :key="index" v-if='selectTypeIndex === 0 || selectTypeIndex === 1'>
+				<MallShipmentsTemplate :item="item" />
+				<view class="actions">
+					<view class="nowPay" @click="goDetail(item.shipment_no)">查看详情</view>
+					<view v-if="item.can.cancel" @click="nowCancel(index,item.shipment_no)" class="nowPay">取消订单</view>
+					<view v-if="item.can.sign" @click="nowSign(index,item.shipment_no)" class="nowPay">确认签收</view>
+					<view v-if="item.can.refund" @click="nowRefund(item.shipment_no)" class="nowPay">申请退货</view>
+					<view v-if="item.can.logistic" @click="nowLogistics(item.shipment_no)" class="nowPay">查看物流</view>
+				</view>
+			</view>
+			<!-- 有订单列表 -->
+			<view class="" v-if="selectTypeIndex === 2">
+			  <!-- 订单列表 -->
+			  <view class="order-list" v-for="(item,index) in lists" :key="index">
+			    <MallRefundsTemplate :item="item" />
+			    <view class="actions">
+			      <view @click="goDetail1(item.refund_id)" class="nowPay">查看详情</view>
+			    </view>
+			  </view>
+			</view>
+		</block>
+	
+		<!-- 没有订单列表 -->
+		<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import MallShipmentsTemplate from '@/components/mall-shipments-template/mall-shipments-template'
+	import MallRefundsTemplate from '@/components/mall-refunds-template/mall-refunds-template'
+	import {
+		mallShipmentsPostShop,
+		mallShipmentsSign,
+		mallShipmentsCancel
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		components: {
+			MallShipmentsTemplate,MallRefundsTemplate
+		},
+		data() {
+			return {
+				lists: [],
+				page: 1,
+				total: 0,
+				navList: [],
+				count: {}, // 订单数量
+				typeList: [{
+						name: '快递单',
+						id: 'post',
+						categrery: [{
+								name: '待发货',
+								id: 'init'
+							},
+							{
+								name: '已发货',
+								id: 'delivered'
+							},
+							{
+								name: '已签收',
+								id: 'signed'
+							},
+							{
+								name: '已完成',
+								id: 'completed'
+							}
+						]
+					},
+					{
+						name: '自提单',
+						id: 'take',
+						categrery: [{
+								name: '已提货',
+								id: 'signed'
+							},
+							{
+								name: '已完成',
+								id: 'completed'
+							}
+						]
+					},
+					{
+						name: '退货单',
+						id: 'refund',
+						categrery: [{
+								name: '待审核',
+								id: 'apply'
+							}, {
+								name: '待返货',
+								id: 'deliver'
+							}, {
+								name: '待签收',
+								id: 'delivered'
+							}, {
+								name: '已签收',
+								id: 'signed'
+							},
+							{
+								name: '待退数权',
+								id: 'process'
+							},
+							{
+								name: '完成退货',
+								id: 'completed'
+							}
+						]
+					},
+				],
+				selectTypeId: 'post',
+				state: 'init',
+				selectTypeIndex: 0
+			};
+		},
+		onLoad(e) {
+			this.getList()
+		},
+		onShow() {
+			console.log(uni.getStorageSync('refresh'), 'getStorageSync')
+			if (uni.getStorageSync('refresh')) {
+				this.reset()
+			}
+		},
+		onUnload() {
+			uni.setStorageSync('refresh', false)
+		},
+		onReachBottom() {
+			if (this.total > this.lists.length) {
+				this.page = this.page + 1
+				this.getList()
+			} else {
+				this.$refs.uToast.show({
+					title: '吼吼吼~我是有底的~',
+					type: 'error',
+					icon: false,
+					duration: 3000
+				})
+			}
+		},
+		methods: {
+			reset() {
+				this.page = 1
+				this.total = 0
+				this.lists = []
+				this.getList()
+				uni.setStorageSync('refresh', false)
+			},
+			// 选择状态
+			selectNav(id) {
+				if (this.state !== id) {
+					this.state = id
+					this.reset()
+				}
+			},
+			// 快递单post 提货单 take 退货单refund
+			selectType(id,index) {
+				console.log('id：' + id)
+				if (this.selectTypeId !== id) {
+					this.state = this.typeList[index].categrery[0].id
+					this.selectTypeId = id
+					this.selectTypeIndex = index
+					this.reset()
+				}
+			},
+			// 获取订单列表
+			getList() {
+				let data = {
+					pageSize: 4,
+					page: this.page,
+					state: this.state
+				}
+				let apiUrl = ''
+				if (this.selectTypeId === 'post') {
+					apiUrl = 'mall/shipments/post'
+				} else if(this.selectTypeId === 'take') {
+					apiUrl = 'mall/shipments/shop'
+				} else if(this.selectTypeId === 'refund') {
+					apiUrl = 'mall/refunds'
+				}
+				mallShipmentsPostShop(apiUrl, data).then(res => {
+					console.log(res.count)
+					this.count = res.count
+					this.lists = this.lists.concat(res.lists.data)
+					this.total = res.lists.page.total
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon: false,
+						duration: 3000
+					})
+				})
+			},
+			// 取消提货单
+			nowCancel(index, no) {
+				console.log(index, no)
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsCancel(no).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+							})
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						}
+					}
+				});
+
+			},
+			// 签收提货单
+			nowSign(index, no) {
+				console.log(index, no)
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '是否确认已经收到商品了呀',
+					success: (res) => {
+						if (res.confirm) {
+							console.log(no)
+							mallShipmentsSign(no).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+								this.lists.splice(index, 1)
+								this.total = this.total - 1
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',
+									icon: false,
+									duration: 3000
+								})
+							})
+
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',
+								icon: false,
+								duration: 3000
+							})
+						}
+					}
+				});
+			},
+
+			// 申请退货
+			nowRefund(no) {
+				this.$router.push({
+					name: 'MallShipmentsRefund',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看物流
+			nowLogistics(no) {
+				this.$router.push({
+					name: 'Orderlogistics',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看详情
+			goDetail(no) {
+				this.$router.push({
+					name: 'MallShipmentsInfo',
+					params: {
+						no: no
+					}
+				})
+			},
+			// 查看退货单详情
+			// 查看详情
+			goDetail1(no){
+				this.$router.push({
+				  name: 'MallRefundsInfo',
+				  params:{
+					  no:no
+				  }
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100%;
+		height: 100%;
+	}
+
+	.NumberWeight {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+
+		// 订单nav
+		.nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			box-sizing: border-box;
+			font-size: $title-size*0.95;
+			padding: 0 30rpx;
+			background-color: #fff;
+			color: #666;
+			border-top: solid 20rpx #f7f7f7;
+			position: sticky;
+			top: 0rpx;
+			z-index: 10000;
+
+			.nav-item {
+				border-bottom: solid 4rpx #fff;
+				padding: 30rpx 10rpx;
+			}
+
+			.nav-item-selected {
+				border-bottom: solid 4rpx $main-color;
+				color: $main-color;
+			}
+		}
+		
+		.nav1 {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			white-space: nowrap;
+			font-size: $title-size*0.95;
+			padding:30rpx 30rpx 20rpx 30rpx;
+			color: #666;
+			position: sticky;
+			top: 120rpx;
+			z-index: 10000;
+			background-color: #f7f7f7;
+		
+			.nav-item {
+				display: inline-block;
+				padding-right: 30rpx;
+			}
+		
+			.nav-item-selected {
+				color: $main-color;
+			}
+		}
+
+		// 订单列表
+		.order-list {
+			background-color: #fff;
+			border-radius: 20rpx;
+			min-height: 300rpx;
+			margin: 30rpx 20rpx 0 20rpx;
+			padding: 30rpx 30rpx 20rpx 30rpx;
+			// border-top: solid 4rpx #cacaca;
+
+			// 操作信息
+			.actions {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				flex-wrap: wrap;
+				flex: 1;
+				font-size: 28rpx;
+				color: #fff;
+				border-top: solid 1rpx #EFF4F2;
+
+				.nowPay {
+					padding: 4rpx 20rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					// background-color: $main-color;
+					color: #999;
+					border: solid 1rpx #cacaca;
+				}
+
+				.cancelOrder {
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+					background-color: #DD524D;
+				}
+
+				.logistics {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+
+				.sign {
+					background-color: #DD524D;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+
+				.evaluate {
+					background-color: $main-color;
+					padding: 10rpx 30rpx;
+					border-radius: 40rpx;
+					margin-left: 20rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
+</style>

pages/property/order/mallShipmentsInfo.vue

@@ -0,0 +1,667 @@
+<template>
+  <view class="OrderInfo">
+    <!-- 订单状态 -->
+    <view class="order-status">
+      <view class="info">
+        {{info.state_text}}
+        <span>您的快递正在坐着火箭朝您飞来</span>
+      </view>
+      <image src="/static/imgs/fire.png" mode="widthFix"></image>
+    </view>
+    <!-- 收货人 -->
+    <view class="acceptInfo" v-if="type === '1'" >
+		<block >
+			<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
+			<view class="address">
+			  <u-icon name="map" color="red"></u-icon>
+			  <span>{{address.full_address}}</span>
+			</view>
+		</block>
+    </view>
+	
+    <view class="goods-info1">
+        <view class="top" >
+          <view class="company">
+            <view class="company-logo">
+              <image :src="info.shop.cover" mode="aspectFill" />
+              <view class="name ellipsis">{{info.shop.name}}</view>
+            </view>
+            <view class="flexrow">
+            	<view class="no ellipsis">发货单号： {{info.shipment_no}}</view>
+            </view>
+          </view>
+      </view>
+      <view class="goods-info">
+        <image class="goods-img" :src="info.goods_sku.cover" mode="aspectFill" />
+        <view class="goods">
+          <view class="name">
+            <view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view> 
+			<!-- <span>￥16.80</span> -->
+          </view>
+          <view class="sku">数权个数 <span>x {{info.qty}}</span> </view>
+        </view>
+      </view>
+     <navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>
+        <view class="total-btn">再次购买</view>
+      </navigator>
+      <view class="goods-type">创建提货单时间 <span>{{info.created_at}}</span></view>
+      <view class="goods-type"  v-if="type === '1'">运费 <span>免邮</span></view>
+	  <view class="goods-type">提货数量 <span><u-number-box v-model="info.qty" :disabled="true"></u-number-box></span></view>
+      <view class="goods-type">提货方式 
+		<u-radio-group v-model="type">
+			<u-radio 
+				v-for="(item, index) in list" :key="index" 
+				:name="item.id"
+				:disabled="type !== item.id"
+			>
+				{{item.name}}
+			</u-radio>
+		</u-radio-group>
+	  </view>
+	<!--  <view class="goods-type" v-if="type === '2'">提货码
+	  		<span @click='takeCode'>查看提货码</span>
+	  </view> -->
+      <view class="goods-type-1" v-if="type === '2'">
+		提货门店 
+		<view class="goods-type-address">
+			<view class="list-top1">
+				<image :src="info.store.cover.showpath"  @click="map(info.store)" mode="aspectFill" class="list-top1-img" />
+				<view class="shop-info shop-info1">
+				  <view class="title ellipsis">{{info.store.name}}</view>
+				  <view class="des" style="padding-top: 16rpx;">营业时间：{{info.store.start_time}}</view>
+				  <view class="des" style="padding-top: 4rpx;" @click="call(info.store.mobile)">联系电话：{{info.store.mobile}}</view>
+				  <view class="des" style="padding-top: 4rpx;" @click="map(info.store)">门店地址：{{info.store.address}}</view>
+				</view>
+			</view>
+		</view>
+	  </view>
+    </view>
+    <!-- 订单 -->
+		<view class="actions">
+		  <view v-if="info.can.cancel" @click="nowCancel(shipment_no)" class="nowPay">取消订单</view>
+		  <view v-if="info.can.sign" @click="nowSign(shipment_no)" class="nowPay">确认签收</view>
+		  <view v-if="info.can.refund" @click="nowRefund(shipment_no)" class="nowPay">申请退货</view>
+		  <view v-if="info.can.logistic" @click="nowLogistics(shipment_no)" class="nowPay">查看物流</view>
+		</view>
+	<!-- <u-toast ref="uToast" /> -->
+	<u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import { mallShipmentsInfo,mallShipmentsCancel,mallShipmentsSign } from '@/apis/interfaces/numberWeight'
+  export default {
+    name: 'OrderInfo',
+    data() {
+      return {
+		info:{},
+		list: [
+			{ name: '快递',	disabled: true , id:'1'},
+			{ name: '自提', disabled: false , id:'2'}
+		],
+		address:{},
+		type: '1', //提货类型：2 自提 1 邮寄
+		showStoreList: false, // 默认false不显示优惠券弹窗列表
+		store_id: '', // 默认没有选择任何一个优惠券
+		store_Name:'',// 门店名称
+		qty :1,
+		shipment_no:'', // 提货单no
+      };
+    },
+	onLoad(e) {
+		this.shipment_no = this.$route.params.no
+		this.getInfo(this.$route.params.no)
+	},
+	onShow() {
+		if(uni.getStorageSync('refresh')){
+			this.getInfo(this.shipment_no)
+		}
+	},
+    methods: {
+		getInfo(shipment_no){
+			mallShipmentsInfo(shipment_no).then(res=>{
+				this.info = res
+				this.address = res.express
+				this.type = res.type+''
+			}).catch(err=>{
+					this.$refs.uToast.show({
+					  title: err.message,
+					  type: 'error',icon:false,
+					  duration: 3000
+					})
+				})
+		},
+		// 取消提货单
+		nowCancel(no){
+			uni.showModal({
+			    title: '哎呦，提醒你',
+			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    success:  (res) =>{
+			        if (res.confirm) {
+			            mallShipmentsCancel(no).then(res=>{
+			            	console.log(res)
+							this.$refs.uToast.show({
+							  title:res,
+							  type: 'error',icon:false,
+							  duration: 3000
+							})
+							this.getInfo(no)
+			            }).catch(err=>{
+			            	this.$refs.uToast.show({
+			            	  title: err.message,
+			            	  type: 'error',icon:false,
+			            	  duration: 3000
+			            	})
+			            })
+			        } else if (res.cancel) {
+						this.$refs.uToast.show({
+						  title:'放弃了~',
+						  type: 'error',icon:false,
+						  duration: 3000
+						})
+			        }
+			    }
+			});
+		},
+		// 签收提货单
+		nowSign(no){
+			console.log(no)
+			uni.showModal({
+			    title: '哎呦，提醒你',
+			    content: '是否确认已经收到商品了呀',
+			    success:  (res) =>{
+			        if (res.confirm) {
+						console.log(no)
+			            mallShipmentsSign(no).then(res=>{
+			            	console.log(res)
+							this.$refs.uToast.show({
+							  title:res,
+							  type: 'error',icon:false,
+							  duration: 3000
+							})
+							this.getInfo(no)
+							uni.setStorageSync('refresh',true)
+			            }).catch(err=>{
+			            	this.$refs.uToast.show({
+			            	  title: err.message,
+			            	  type: 'error',icon:false,
+			            	  duration: 3000
+			            	})
+			            })
+			        
+					} else if (res.cancel) {
+						this.$refs.uToast.show({
+						  title:'放弃了~',
+						  type: 'error',icon:false,
+						  duration: 3000
+						})
+			        }
+			    }
+			});
+		},
+		// 查看提货二维码 弹窗
+		takeCode(){
+			console.log(this.info.code)
+			let url = this.info.code,
+			   urls = [this.info.code]
+			uni.previewImage({
+				current:url,
+				urls:urls
+			})
+		},
+		// 申请退货
+		nowRefund(no){
+			this.$router.push({
+			  name: 'MallShipmentsRefund',
+			  params:{
+				  no:no
+			  }
+			})
+		},
+		call(e){
+			uni.makePhoneCall({
+				phoneNumber:e
+			})
+		},
+		map(info){
+			console.log(info.latitude,info.longitude)
+			uni.openLocation({
+				latitude: Number(info.latitude),
+				longitude: Number(info.longitude),
+				success: function () {
+					console.log('success');
+				}
+			});
+		}
+		
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    width: 100%;
+    height: 100%;
+  }
+
+  .OrderInfo {
+    width: 100%;
+    min-height: 100vh;
+    box-sizing: border-box;
+    background-color: #F7F7F7;
+    padding-bottom: 80rpx;
+
+    .order-status {
+      width: 100%;
+      height: 300rpx;
+      background-image: linear-gradient(to bottom, $main-color, $main-color-light);
+      color: #Fff;
+      font-size: 36rpx;
+      padding: 30rpx 50rpx;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+
+      .info {
+        font-size: 36rpx;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: space-between;
+        box-sizing: border-box;
+
+        span {
+          font-size: 28rpx;
+          padding-top: 30rpx;
+        }
+      }
+
+      image {
+        width: 200rpx;
+      }
+    }
+
+    .acceptInfo {
+      margin: 0 30rpx;
+      background-color: #fff;
+      box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
+      border-radius: 20rpx;
+      padding: 30rpx;
+      position: relative;
+      top: -30rpx;
+
+      .name {
+        font-size: 36rpx;
+        font-weight: 600;
+
+        span {
+          padding-left: 20rpx;
+          font-size: 30rpx;
+        }
+      }
+
+      .address {
+        padding-top: 20rpx;
+        font-size: 28rpx;
+
+        span {
+          margin-left: 10rpx;
+        }
+      }
+    }
+
+    .goods-info1 {
+      padding: 20rpx 40rpx;
+      background-color: #fff;
+
+      .goods-type {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        padding: 30rpx 0;
+        border-bottom: solid 1rpx #f7f7f7;
+      }
+	  .goods-type-1{
+		  display: flex;
+		  flex-direction: column;
+		  align-items: flex-start;
+		  justify-content: space-between;
+		  box-sizing: border-box;
+		  padding: 30rpx 0;
+		  border-bottom: solid 1rpx #f7f7f7;
+	  }
+	  .goods-type-address{
+		  display: flex;
+		  flex-direction: row;
+		  align-items: center;
+		  justify-content: center;
+		  box-sizing: border-box;
+		  u-icon{
+			  padding-left: 20rpx;
+		  }
+	  }
+
+      // 顶部信息
+   .top {
+     display: flex;
+     flex-direction: row;
+     align-items: center;
+     justify-content: space-between;
+     box-sizing: border-box;
+	 padding: 30rpx 0;
+	 border-bottom: solid 1rpx #EFF4F2;
+  
+     .company-logo {
+       display: flex;
+       flex-direction: row;
+       align-items: center;
+       justify-content: flex-start;
+       box-sizing: border-box;
+   
+       image {
+         width: 40rpx;
+         height: 40rpx;
+         border-radius: 50%;
+         margin-right: 20rpx;
+       }
+   
+       .name {
+   		width: 600rpx;
+         font-size: 30rpx;
+         color: #484848;
+         font-weight: bold;
+       }
+     }
+   
+   
+     .no {
+       margin-top: 16rpx;
+       font-size: $title-size*0.8;
+       color: #999;
+   	  // width: 500rpx;
+     }
+   
+     .status {
+       color: #999;
+       font-size: $title-size;
+     }
+   }
+
+      // 商品信息
+      .goods-info {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        justify-content: flex-start;
+        box-sizing: border-box;
+        margin-top: 40rpx;
+
+        .goods-img {
+          width: 120rpx;
+          height: 120rpx;
+          border-radius: 10rpx;
+        }
+
+        .goods {
+          flex: 1;
+          margin-left: 20rpx;
+
+
+          .name {
+            width: 100%;
+            display: flex;
+            flex-direction: row;
+            align-items: flex-start;
+            justify-content: space-between;
+            box-sizing: border-box;
+            font-size: 30rpx;
+            // font-weight: bold;
+
+            .name1 {
+              width: 500rpx;
+            }
+
+            span {
+              font-size: 34rpx;
+              font-weight: normal;
+            }
+          }
+
+          .sku {
+            flex: 1;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            box-sizing: border-box;
+            margin-top: 10rpx;
+            font-size: 28rpx;
+            color: #999;
+          }
+        }
+      }
+
+      // 合计信息
+      .total {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-end;
+        box-sizing: border-box;
+        font-size: 26rpx;
+        color: $main-color;
+        flex: 1;
+        text-align: right;
+        margin-top: 20rpx;
+        padding-bottom: 30rpx;
+      }
+      
+      .total-btn {
+        border: solid 1rpx $main-color;
+        padding: 6rpx 20rpx;
+        border-radius: 10rpx;
+      }
+    }
+    // 操作信息
+      .actions {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-end;
+        box-sizing: border-box;
+        flex-wrap: wrap;
+		background-color: #fff;
+        flex: 1;
+        font-size: 28rpx;
+		padding: 20rpx 50rpx 30rpx 50rpx;
+        color: #fff;
+        .nowPay {
+          padding: 4rpx 20rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          // background-color: $main-color;
+		  color: #999;
+		  border:solid 1rpx #cacaca;
+        }
+
+        .cancelOrder {
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          background-color: #DD524D;
+        }
+
+        .logistics {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .sign {
+          background-color: #DD524D;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .evaluate {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+      }
+  
+  }
+  .flexrow{
+  	  display: flex;
+  	  flex-direction: row;
+  	  align-items: center;
+  	  justify-content: space-between;
+  	  box-sizing: border-box;
+  	  width: 100%;
+  	  .copy{
+  		  color: $main-color;
+  			font-size: $title-size*0.8;
+  		  font-weight: 400;
+  		  padding: 0 30rpx;
+  	  }
+  }
+  .no-address{
+	display: flex;  
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+  }
+  // 优惠券弹窗
+  .scrollView {
+    // padding: 40rpx;
+    box-sizing: border-box;
+    position: relative;
+  
+    // 标题
+    .coupon-title {
+      padding: 40rpx;
+      font-weight: bold;
+      font-size: 40rpx;
+      border-bottom: solid 1rpx #f7f7f7;
+    }
+  
+    // 优惠券样式
+    .coupon-list-item {
+      border-bottom: solid 1rpx #f7f7f7;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      box-sizing: border-box;
+      position: relative;
+      width: 100%;
+  
+      .coupon-list-item {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background-color: rgba($color: #000, $alpha: 0);
+        z-index: 10001;
+      }
+    }
+  }
+  .list-top1{
+	  display: flex;
+	  flex-direction: row;
+	  align-items: flex-start;
+	  justify-content: space-between;
+	  box-sizing: border-box;
+	  font-size: $title-size*0.94;
+	  width: 100%;
+	  margin-left: 0 !important;
+	  margin-top: 30rpx;
+	  .shop-info{
+		  margin-left: 20rpx;
+	  }
+	  .list-top1-img{
+		  width:170rpx;
+		  height: 170rpx;
+		  border-radius: 10rpx;
+	  }
+	  .des{
+		  font-size: 28rpx;
+	  }
+	  .title{
+		  font-size: 32rpx;
+	  }
+  }
+  .list-top {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    padding: 30rpx 0;
+    font-size: $title-size*0.94;
+    border-bottom: solid 1rpx #f7f7f7;
+	width: 600rpx;
+	margin-left: 30rpx;
+    .list-top-left {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      box-sizing: border-box;
+		.shop-info{
+			flex: 1;
+		}
+      .title {
+        width: 380rpx;
+        font-size: $title-size*1;
+        font-weight: 400;
+      }
+  
+      .urate {
+        padding: 10rpx 0;
+      }
+  
+      .des {
+        // padding-top: $padding*0.8;
+        font-size: $title-size * 0.8;
+        color: #999;
+  
+        span {
+          color: #666;
+          padding: 0 10rpx;
+        }
+      }
+	
+      .list-banner {
+        width: 120rpx;
+        margin-right: $margin*1.5;
+        height: 120rpx;
+        border-radius: 4rpx;
+      }
+    }
+  
+    .list-top-right {
+      border: solid 1rpx $main-color;
+      color: $main-color;
+      display: inline-block;
+      padding: 8rpx 16rpx;
+      font-size: $title-size *0.8;
+      border-radius: 4rpx;
+    }
+  }
+  
+</style>

pages/property/order/mallShipmentsRefund.vue

@@ -0,0 +1,338 @@
+<template>
+	<view class="MallShipmentRefund">
+		<view class="mes-des">
+			因您信誉良好 尊享：退货包运费·7天无理由退货
+		</view>
+
+		<!-- 申请类型 -->
+		<view class="list">
+			<view class="list-left">申请类型</view>
+			<view class="list-right">申请退货</view>
+		</view>
+
+		<!-- 退货原因 -->
+		<view class="list">
+			<view class="list-left">退货原因</view>
+			<u-select v-model="show" :list="list" mode='single-column' @confirm="confirm"></u-select>
+			<view class="list-right" @click="show = true">{{title?title:'请选择退货'}}
+				<u-icon name="arrow-right" color="#cacaca" size="26" />
+			</view>
+		</view>
+
+		<!-- 退货图片 -->
+		<view class="list">
+			<view class="list-left">退货图片</view>
+			<view class="list-right-img">
+				<view class="upImg" v-for="(item,index) in pictures.showpath">
+					<image @click="priviewImg(index)" mode="aspectFill" :src="item" />
+					<u-icon name="close" @click='closeImg(index)' class='closeImg' />
+				</view>
+				<view class="addImg" @click="updImgs">
+					<u-icon name="plus" label='上传图片' label-pos='bottom' size='50' margin-bottom='10' color='#606266'
+						label-size='26' />
+				</view>
+			</view>
+		</view>
+
+		<!-- 申请原因 -->
+		<view class="list1">
+			<view class="list-left">备注原因</view>
+			<u-input class="list-right" v-model="remark" maxlength='300' placeholder='请输入您的退货原因' type="textarea"
+				height='230' :border="true" :clearable='false' />
+			<view class="">
+				{{remark.length+'/'+300}}
+			</view>
+		</view>
+
+		<!-- 订单 -->
+		<view class="actions">
+			<view class="nowPay" @click="sure">确认退货</view>
+		</view>
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		mallShipmentsRefundInfo,
+		mallShipmentsRefund
+	} from '@/apis/interfaces/numberWeight'
+	import {
+		uploads
+	} from '@/apis/interfaces/uploading'
+	export default {
+		name: 'MallShipmentRefund',
+		data() {
+			return {
+				remark: '',
+				shipment_no: '', // 提货单no
+				title: '',
+				list: [],
+				show: false,
+				pictures: {
+					path: [],
+					showpath: []
+				}, // 退货单图片
+			};
+		},
+		onLoad(e) {
+			this.shipment_no = this.$route.params.no
+			this.getInfo(this.shipment_no)
+		},
+		methods: {
+			// 预览上传图片
+			priviewImg(index) {
+				console.log(index, this.pictures.showpath)
+				uni.previewImage({
+					current: index,
+					urls: this.pictures.showpath
+				})
+			},
+			// 上传图片
+			updImgs(type) {
+				uni.chooseImage({
+					success: res => {
+						console.log(res)
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri: val.path
+							}
+						})
+						uploads(path).then(pathRes => {
+							// console.log(pathRes)
+							this.pictures = {
+								path: [...this.pictures.path, ...pathRes.path],
+								showpath: [...this.pictures.showpath, ...pathRes.url]
+							}
+							console.log(this.pictures)
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon: 'none'
+							})
+						})
+					}
+				})
+			},
+			// 删除图片
+			closeImg(index) {
+				console.log(index)
+				this.pictures.path.splice(index, 1)
+				this.pictures.showpath.splice(index, 1)
+
+				console.log(this.pictures);
+			},
+			// 获取退货的基本信息
+			getInfo(shipment_no) {
+				mallShipmentsRefundInfo(shipment_no).then(res => {
+					let list = res.title
+					let lists = []
+					list.map(item => {
+						let items = {
+							label: item
+						}
+						lists.push(items)
+					})
+					console.log(lists)
+					this.list = lists
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',icon:false,
+						duration: 3000
+					})
+				})
+			},
+			confirm(e) {
+				this.title = e[0].label
+			},
+			sure() {
+				let data = {
+					title: this.title,
+					shipment_no: this.shipment_no,
+					remark: this.remark,
+					pictures: JSON.stringify(this.pictures.path)
+				}
+				if (data.title === '') {
+					this.$refs.uToast.show({
+						title: '请选择退货原因',
+						type: 'error',icon:false,
+						duration: 3000
+					})
+					return;
+				}
+				if (data.remark === '') {
+					this.$refs.uToast.show({
+						title: '请填写备注信息',
+						type: 'error',icon:false,
+						duration: 3000
+					})
+					return;
+				}
+
+				uni.showModal({
+					title: '哎呦，提醒你',
+					content: '您是否确认申请退货',
+					success: (res) => {
+						if (res.confirm) {
+							mallShipmentsRefund(data).then(res => {
+								console.log(res)
+								this.$refs.uToast.show({
+									title: res,
+									type: 'error',icon:false,
+									duration: 3000
+								})
+								uni.setStorageSync('refresh', true)
+								setTimeout(res => {
+									uni.navigateBack()
+								}, 2000)
+							}).catch(err => {
+								this.$refs.uToast.show({
+									title: err.message,
+									type: 'error',icon:false,
+									duration: 3000
+								})
+							})
+						} else if (res.cancel) {
+							this.$refs.uToast.show({
+								title: '放弃了~',
+								type: 'error',icon:false,
+								duration: 3000
+							})
+						}
+					}
+				});
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	// 
+	.mes-des {
+		background-color: rgba($color: #ff0000, $alpha: .1);
+		color: #ff0000;
+		text-shadow: 0 0 6rpx rgba($color: #000000, $alpha:.1);
+		padding: 32rpx;
+		text-align: center;
+	}
+
+	// 确认退货
+	.actions {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		flex-wrap: wrap;
+		flex: 1;
+		font-size: 28rpx;
+		padding: 30rpx;
+		color: #fff;
+
+		.nowPay {
+			padding: 20rpx 30rpx;
+			border-radius: 40rpx;
+			margin-left: 20rpx;
+			margin-top: 20rpx;
+			width: 600rpx;
+			font-size: 32rpx;
+			background-color: $main-color;
+			text-align: center;
+		}
+	}
+
+	.list1 {
+		font-size: 30rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: flex-start;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-bottom: solid 1rpx #f7f7f7;
+
+		u-input {
+			width: 100%;
+			margin-top: 30rpx;
+		}
+		.list-right {
+			width: 100%;
+			margin-top: 30rpx;
+		}
+	}
+
+	.list {
+		font-size: 30rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-start;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-bottom: solid 1rpx #f7f7f7;
+
+		.list-right {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			flex: 1;
+			margin-left: 50rpx;
+			font-size: 30rpx;
+		}
+
+		.list-right-img {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+			box-sizing: border-box;
+			flex: 1;
+			margin-left: 50rpx;
+			font-size: 30rpx;
+
+			.upImg {
+				width: 159rpx;
+				height: 159rpx;
+				margin: 4rpx;
+				position: relative;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+				.closeImg {
+					position: absolute;
+					top: 0;
+					right: 0;
+					z-index: 1;
+					padding: 20rpx;
+				}
+			}
+
+			.addImg {
+				width: 159rpx;
+				height: 159rpx;
+				background-color: #f7f7f7;
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>

pages/property/order/numberWeight.vue

@@ -0,0 +1,186 @@
+<template>
+  <view class="NumberWeight">
+    <!-- 有订单列表 -->
+    <view class="" v-if="lists.length > 0">
+      <!-- 订单列表 -->
+      <view class="order-list" v-for="(item,index) in lists" :key="index">
+        <NumberWeightTemplate :item="item" />
+        <view class="actions">
+          <view @click="nowTake(item.symbol)" class="nowPay">去提货</view>
+        </view>
+      </view>
+    </view>
+    <!-- 没有订单列表 -->
+	<no-list v-if="lists.length === 0" name='no-order' txt="暂无数据~" />
+	<!-- <u-toast ref="uToast" /> -->
+	<u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import  NumberWeightTemplate  from '@/components/number-weight-template/number-weight-template'
+  import { mallWarrants } from '@/apis/interfaces/numberWeight'
+  export default {
+    components: {
+      NumberWeightTemplate
+    },
+    data() {
+      return {
+        lists: [],
+		page:1,
+		total:0
+      };
+    },
+	onLoad() {
+		this.getList()
+	},
+	onShow(){
+		if(uni.getStorageSync('refresh')){
+			this.page =1
+			this.total = 0
+			this.lists = []
+			this.getList()
+		}
+	},
+	onUnload() {
+		uni.setStorageSync('refresh',false)
+	},
+	onReachBottom() {
+		if(this.total>this.lists.length){
+			this.page = this.page + 1
+			this.getList()
+		}else{
+			this.$refs.uToast.show({
+			  title: '吼吼吼~我是有底的~',
+			  type: 'error',icon:false,
+			  duration: 3000
+			})
+		}
+	},
+    methods: {
+		getList(){
+			let data = {
+				perPage:10,
+				page:this.page
+			}
+			mallWarrants(data).then(res=>{
+				this.lists = this.lists.concat(res.data)
+				this.total = res.total
+			}).catch(err=>{
+				this.$refs.uToast.show({
+				  title: err.message,
+				  type: 'error',icon:false,
+				  duration: 3000
+				})
+			})
+		},
+		// 立即提货
+		nowTake(symbol){
+			uni.navigateTo({
+				url:'./numberWeightInfo?symbol='+symbol
+			})
+		}
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  page {
+    width: 100%;
+    height: 100%;
+  }
+
+  .NumberWeight {
+    width: 100%;
+    min-height: 100vh;
+    box-sizing: border-box;
+    background-color: #F7F7F7;
+
+    // 订单nav
+    .nav {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      font-size: $title-size*0.95;
+      padding: 0 30rpx;
+      background-color: #fff;
+      color: #666;
+      border-top: solid 20rpx #f7f7f7;
+
+      .nav-item {
+        border-bottom: solid 4rpx #fff;
+        padding: 30rpx 10rpx;
+      }
+
+      .nav-item-selected {
+        border-bottom: solid 4rpx $main-color;
+        color: $main-color;
+      }
+    }
+
+    // 订单列表
+    .order-list {
+      background-color: #fff;
+      border-radius: 20rpx;
+      min-height: 300rpx;
+      margin: 30rpx 20rpx 0 20rpx;
+      padding:30rpx 30rpx 20rpx 30rpx ;
+	  // border-top: solid 4rpx #cacaca;
+
+      // 操作信息
+      .actions {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-end;
+        box-sizing: border-box;
+        flex-wrap: wrap;
+        flex: 1;
+        font-size: 28rpx;
+        color: #fff;
+		border-top: solid 1rpx #EFF4F2;
+        .nowPay {
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          background-color: $main-color;
+        }
+
+        .cancelOrder {
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+          background-color: #DD524D;
+        }
+
+        .logistics {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .sign {
+          background-color: #DD524D;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+
+        .evaluate {
+          background-color: $main-color;
+          padding: 10rpx 30rpx;
+          border-radius: 40rpx;
+          margin-left: 20rpx;
+          margin-top: 20rpx;
+        }
+      }
+    }
+  }
+</style>

pages/property/order/numberWeightInfo.vue

@@ -0,0 +1,788 @@
+<template>
+	<view class="OrderInfo">
+		<!-- 订单状态 -->
+		<view class="order-status">
+			<view class="info">
+				待提货
+				<span>确认提货后快递会坐着火箭朝您飞来</span>
+			</view>
+			<image src="/static/imgs/fire.png" mode="widthFix" />
+		</view>
+		<!-- 收货人 -->
+		<view class="acceptInfo" v-if="type === '1'">
+			<navigator v-if='!!address.name' url="/pages/property/address/list?type=1" hover-class="none">
+				<view class="name">{{address.name}} <span>{{address.mobile}}</span> </view>
+				<view class="address">
+					<u-icon name="map" color="red"></u-icon>
+					<span>{{address.full_address}}</span>
+				</view>
+			</navigator>
+			<navigator v-else class="no-address selectNew" url="/pages/property/address/list?type=1" hover-class="none">
+				<u-icon name="map-fill" color="#208bff" size="40" label='选择收货地址' />
+			</navigator>
+		</view>
+
+		<view class="goods-info1">
+			<view class="top">
+				<view class="company">
+					<view class="company-logo">
+						<image :src="shop.cover" mode="aspectFill" />
+						<view class="name ellipsis">{{shop.name}}</view>
+					</view>
+					<view class="flexrow">
+						<view class="no ellipsis">区块链地址： {{account.addr}}</view> <span class="copy"
+							@click='copy(account.addr)'>复制</span>
+					</view>
+				</view>
+			</view>
+			<view class="goods-info">
+				<image class="goods-img" :src="goods.cover" mode="aspectFill" />
+				<view class="goods">
+					<view class="name">
+						<view class="name1 ellipsis-2">{{goods.goods_name}}</view>
+						<!-- <span>￥16.80</span> -->
+					</view>
+					<view class="sku">可提个数 <span>x {{account.balance}}</span> </view>
+				</view>
+			</view>
+			<navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+goods.goods_id'>
+				<view class="total-btn">再次购买</view>
+			</navigator>
+			<view class="goods-type" v-if="type === '1'">运费 <span>免邮</span></view>
+			<view class="goods-type">提货数量 <span>
+					<u-number-box v-model="qty" :min='1' :max='account.balance'></u-number-box>
+				</span></view>
+			<view class="goods-type">提货方式
+				<u-radio-group v-model="type" @change="radioGroupChange">
+					<u-radio v-for="(item, index) in list" :key="index" :name="item.id" :disabled="type !== item.id">
+						{{item.name}}
+					</u-radio>
+				</u-radio-group>
+			</view>
+			<!-- 不显示了就 -->
+			<view class="goods-type" v-if="type === '100'">
+				提货门店
+				<view class="goods-type-address" @click="showStoreList = true">
+					{{store_Name!==''?store_Name:'选择门店'}}
+					<u-icon name="arrow-right" color="#999" size="20" />
+				</view>
+			</view>
+		</view>
+		<!-- 订单 -->
+		<view class="actions">
+			<view class="nowPay" @click="nowTake">{{type === '2'?'生成提货二维码':'确认提货'}}</view>
+		</view>
+
+		<!-- 优惠券弹窗 -->
+		<u-popup v-model="showStoreList" mode="bottom" border-radius="14">
+			<scroll-view scroll-y="true" style="height: 1000rpx;" class="scrollView">
+				<view class="coupon-title">可提货门店</view>
+				<view class="coupon-list-item" v-for="(item,index) in stores" :key="index" v-if="stores.length>0">
+					<u-icon v-if="store_id!== item.store_id" name="checkmark-circle" color="#cacaca" size="50" />
+					<u-icon v-else name="checkmark-circle-fill" color="#2979ff" size="50" />
+					<!-- 遮挡层用户控制点击事件 -->
+					<view class="list-top">
+						<view class="list-top-left">
+							<image :src="item.cover" mode="aspectFill" class="list-banner"></image>
+							<view class="shop-info">
+								<view class="title ellipsis">{{item.name}}</view>
+								<view class="des" style="padding-top: 12rpx;">营业时间：{{item.opening_time}}</view>
+								<view class="des" style="padding-top: 4rpx;">门店地址：{{item.address}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="coupon-list-item" @click="selectStore(item)"></view>
+				</view>
+				<!-- 没有优惠券列表 -->
+				<no-list v-if="stores.length === 0" name='no-shop' txt="没有任何门店哦~" />
+			</scroll-view>
+		</u-popup>
+
+		<!-- 二维码展示动画效果 -->
+		<view class="showCode " v-if="showCode">
+			<view class="showCodeBg" @click="showCode = false"></view>
+			<view :class="['showCodeContent', showCode?'showCodeContentSelect':'showCodeContentSelectNo']">
+				<view class="showCodeTitle">提货二维码</view>
+				<image :src="showCodeImg" mode="widthFix"></image>
+				<view class="showCodeDes">此码请小心保管,丢失或被用不退不换</view>
+			</view>
+		</view>
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		mallWarrantsList,
+		mallWarrantsSure,
+		mallWarrantsQrcode
+	} from '@/apis/interfaces/numberWeight'
+	export default {
+		name: 'OrderInfo',
+		data() {
+			return {
+				symbol: '',
+				account: {},
+				address: {},
+				addresses: [],
+				goods: {},
+				shop: {},
+				stores: [],
+				list: [{
+						name: '快递',
+						disabled: false,
+						id: '1'
+					},
+					{
+						name: '自提',
+						disabled: false,
+						id: '2'
+					}
+				],
+				type: '', //提货类型：2 自提 1 邮寄
+				showStoreList: false, // 默认false不显示优惠券弹窗列表
+				store_id: '', // 默认没有选择任何一个优惠券
+				store_Name: '', // 门店名称
+				qty: 1,
+				showCode:false,
+				showCodeImg:''
+			};
+		},
+		onLoad(e) {
+			this.symbol = e.symbol
+			this.getInfo(e.symbol)
+			// this.getInfo('G22S20')
+		},
+		methods: {
+			getInfo(symbol) {
+				mallWarrantsList(symbol).then(res => {
+					this.account = res.account
+					this.address = res.address
+					this.addresses = res.addresses
+					this.goods = res.goods
+					this.stores = res.stores
+					this.shop = res.shop
+					this.stores = res.stores
+					this.qty = res.account.balance
+					this.type = res.logistic_type + ''
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',icon:false,
+						duration: 3000
+					})
+					setTimeout(res => {
+						uni.navigateBack({})
+					}, 2000)
+				})
+			},
+			// 选中任一radio时，由radio-group触发
+			radioGroupChange(e) {
+				this.type = e
+				if (e === '2') {
+					this.store_id = ''
+					this.store_Name = ''
+				}
+			},
+			// 选择可用优惠券
+			selectStore(item) {
+				this.store_id = item.store_id
+				this.store_Name = item.name
+				this.showStoreList = false
+			},
+			// 确认提货
+			nowTake() {
+				let data = {
+					symbol: this.symbol,
+					type: this.type,
+					store_id: this.store_id || '',
+					qty: this.qty,
+					address_id: this.address.address_id || '',
+				}
+				if (data.type === '1') {
+					if (data.address_id === '') {
+						this.$refs.uToast.show({
+							title: '请添加收货地址',
+							type: 'error',icon:false,
+							duration: 3000
+						})
+						return;
+					}
+					data.store_id = ''
+				}
+				console.log(data)
+				// 快递单继续沿用之前的信息
+				if (data.type === '1') {
+					mallWarrantsSure(data).then(res => {
+						console.log(res)
+						this.$refs.uToast.show({
+							title: res,
+							type: 'error',icon:false,
+							duration: 3000,
+						})
+						uni.setStorageSync('refresh', true)
+						setTimeout(res => {
+							uni.navigateBack({})
+						}, 3000)
+
+					}).catch(err => {
+						this.$refs.uToast.show({
+							title: err.message,
+							type: 'error',icon:false,
+							duration: 3000
+						})
+					})
+				}
+				// 提货或者服务单生成二维码
+				else {
+					mallWarrantsQrcode(data).then(res => {
+						console.log(res)
+						this.showCodeImg = res.code
+						// uni.setStorageSync('refresh', true)
+						this.showCode = true
+					}).catch(err => {
+						this.$refs.uToast.show({
+							title: err.message,
+							type: 'error',icon:false,
+							duration: 3000
+						})
+					})
+				}
+			},
+			// 复制
+			copy(e) {
+				uni.setClipboardData({
+					data: e,
+					success: () => {
+
+					}
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100%;
+		height: 100%;
+	}
+
+	.OrderInfo {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+		padding-bottom: 80rpx;
+
+		.order-status {
+			width: 100%;
+			height: 300rpx;
+			background-image: linear-gradient(to bottom, $main-color, $main-color-light);
+			color: #Fff;
+			font-size: 36rpx;
+			padding: 30rpx 50rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+			.info {
+				font-size: 36rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: space-between;
+				box-sizing: border-box;
+
+				span {
+					font-size: 28rpx;
+					padding-top: 30rpx;
+				}
+			}
+
+			image {
+				width: 200rpx;
+			}
+		}
+
+		.acceptInfo {
+			margin: 0 30rpx;
+			background-color: #fff;
+			box-shadow: 0 0 14rpx 4rpx rgba($color: $main-color, $alpha: 0.2);
+			border-radius: 20rpx;
+			padding: 30rpx;
+			position: relative;
+			top: -30rpx;
+
+			.name {
+				font-size: 36rpx;
+				font-weight: 600;
+
+				span {
+					padding-left: 20rpx;
+					font-size: 30rpx;
+				}
+			}
+
+			.address {
+				padding-top: 20rpx;
+				font-size: 28rpx;
+
+				span {
+					margin-left: 10rpx;
+				}
+			}
+		}
+
+		.goods-info1 {
+			padding: 20rpx 40rpx;
+			background-color: #fff;
+
+			.goods-type {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+			}
+
+			.goods-type-address {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+				box-sizing: border-box;
+
+				u-icon {
+					padding-left: 20rpx;
+				}
+			}
+
+			// 顶部信息
+			.top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+				border-bottom: solid 1rpx #EFF4F2;
+
+				.company-logo {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+
+					.name {
+						width: 600rpx;
+						font-size: 30rpx;
+						color: #484848;
+						font-weight: bold;
+					}
+				}
+
+
+				.no {
+					margin-top: 10rpx;
+					font-size: $title-size*0.8;
+					color: #999;
+					width: 500rpx;
+				}
+
+				.status {
+					color: #999;
+					font-size: $title-size;
+				}
+			}
+
+			// 商品信息
+			.goods-info {
+				display: flex;
+				flex-direction: row;
+				align-items: flex-start;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				margin-top: 40rpx;
+
+				.goods-img {
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 10rpx;
+				}
+
+				.goods {
+					flex: 1;
+					margin-left: 20rpx;
+
+
+					.name {
+						width: 100%;
+						display: flex;
+						flex-direction: row;
+						align-items: flex-start;
+						justify-content: space-between;
+						box-sizing: border-box;
+						font-size: 30rpx;
+						// font-weight: bold;
+
+						.name1 {
+							width: 500rpx;
+						}
+
+						span {
+							font-size: 34rpx;
+							font-weight: normal;
+						}
+					}
+
+					.sku {
+						flex: 1;
+						display: flex;
+						flex-direction: row;
+						align-items: center;
+						justify-content: space-between;
+						box-sizing: border-box;
+						margin-top: 10rpx;
+						font-size: 28rpx;
+						color: #999;
+					}
+				}
+			}
+
+			// 合计信息
+			.total {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+				box-sizing: border-box;
+				font-size: 26rpx;
+				color: $main-color;
+				flex: 1;
+				text-align: right;
+				margin-top: 20rpx;
+				padding-bottom: 30rpx;
+			}
+
+			.total-btn {
+				border: solid 1rpx $main-color;
+				padding: 6rpx 20rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		// 操作信息
+		.actions {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			flex-wrap: wrap;
+			flex: 1;
+			font-size: 28rpx;
+			padding: 30rpx;
+			color: #fff;
+
+			.nowPay {
+				padding: 20rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				width: 600rpx;
+				font-size: 32rpx;
+				background-color: $main-color;
+				text-align: center;
+			}
+
+			.cancelOrder {
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+				background-color: #DD524D;
+			}
+
+			.logistics {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.sign {
+				background-color: #DD524D;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+
+			.evaluate {
+				background-color: $main-color;
+				padding: 10rpx 30rpx;
+				border-radius: 40rpx;
+				margin-left: 20rpx;
+				margin-top: 20rpx;
+			}
+		}
+	}
+
+	.flexrow {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		width: 100%;
+
+		.copy {
+			color: $main-color;
+			font-size: $title-size*0.8;
+			font-weight: 400;
+			padding: 0 30rpx;
+		}
+	}
+
+	.no-address {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+	}
+
+	// 优惠券弹窗
+	.scrollView {
+		// padding: 40rpx;
+		box-sizing: border-box;
+		position: relative;
+
+		// 标题
+		.coupon-title {
+			padding: 40rpx;
+			font-weight: bold;
+			font-size: 40rpx;
+			border-bottom: solid 1rpx #f7f7f7;
+		}
+
+		// 优惠券样式
+		.coupon-list-item {
+			border-bottom: solid 1rpx #f7f7f7;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			position: relative;
+			width: 100%;
+
+			.coupon-list-item {
+				width: 100%;
+				height: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+				background-color: rgba($color: #000, $alpha: 0);
+				z-index: 10001;
+			}
+		}
+	}
+
+	.list-top {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 30rpx 0;
+		font-size: $title-size*0.94;
+		border-bottom: solid 1rpx #f7f7f7;
+		width: 600rpx;
+		margin-left: 30rpx;
+
+		.list-top-left {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: flex-start;
+			box-sizing: border-box;
+
+			.shop-info {
+				flex: 1;
+			}
+
+			.title {
+				width: 380rpx;
+				font-size: $title-size*1;
+				font-weight: 400;
+			}
+
+			.urate {
+				padding: 10rpx 0;
+			}
+
+			.des {
+				// padding-top: $padding*0.8;
+				font-size: $title-size * 0.8;
+				color: #999;
+
+				span {
+					color: #666;
+					padding: 0 10rpx;
+				}
+			}
+
+			.list-banner {
+				width: 120rpx;
+				margin-right: $margin*1.5;
+				height: 120rpx;
+				border-radius: 4rpx;
+			}
+		}
+
+		.list-top-right {
+			border: solid 1rpx $main-color;
+			color: $main-color;
+			display: inline-block;
+			padding: 8rpx 16rpx;
+			font-size: $title-size *0.8;
+			border-radius: 4rpx;
+		}
+	}
+
+	// 二维码展示
+	// 动画效果
+	.showCode {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 1;
+
+		.showCodeBg {
+			background-color: rgba($color:#000, $alpha: 0.3);
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+
+		.showCodeContentSelect {
+			animation: sk-foldCubeAngle .6s linear both;
+		}
+
+		.showCodeContentSelectNo {
+			animation: sk-foldCubeAngleNo .6s linear both;
+		}
+
+		.showCodeContent {
+			width: 600rpx;
+			minheight: 500rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			padding: 30rpx;
+			position: relative;
+			z-index: 199;
+
+			image {
+				width: 60%;
+			}
+
+			.showCodeTitle {
+				font-weight: 600;
+				padding-bottom: 20rpx;
+				font-size: 36rpx;
+				margin-bottom: 20rpx;
+			}
+			.showCodeDes{
+				padding: 20rpx 0 20rpx 0;
+				color: gray;
+				font-size: 24rpx;
+			}
+		}
+
+		@keyframes sk-foldCubeAngle {
+			0% {
+				-webkit-transform: perspective(140px) rotateX(-180deg);
+				transform: perspective(140px) rotateX(-180deg);
+				opacity: 0;
+			}
+
+			100% {
+				-webkit-transform: perspective(140px) rotateX(0deg);
+				transform: perspective(140px) rotateX(0deg);
+				opacity: 1;
+			}
+		}
+
+		@keyframes sk-foldCubeAngleNo {
+			0% {
+				transform: scale(1);
+				opacity: 1;
+			}
+
+			25% {
+				transform: scale(0);
+				opacity: 0;
+			}
+		}
+
+		@keyframes turn {
+			0% {
+				-webkit-transform: rotate(0deg);
+				opacity: 1;
+			}
+
+			25% {
+				-webkit-transform: rotate(90deg);
+				opacity: .9;
+			}
+
+			50% {
+				-webkit-transform: rotate(180deg);
+				opacity: .8;
+			}
+
+			75% {
+				-webkit-transform: rotate(270deg);
+				opacity: .9;
+			}
+
+			100% {
+				-webkit-transform: rotate(360deg);
+				opacity: 1;
+			}
+		}
+
+	}
+</style>

pages/store/index.vue

@@ -40,7 +40,7 @@
 				<!-- 老板 -->
 				<boss v-if="!employee" :word-data="workbench"/>
 				<!-- 员工 -->
-				<staff v-if="employee"/>
+				<staff v-if="employee" :tool-list="toolList"/>
 			</block>
 		</block>
 		<!-- 登录提示 -->
@@ -60,6 +60,7 @@
 <script>
 	import { index } from '@/apis/interfaces/store'
 	import { isallow, appliesQuery } from '@/apis/interfaces/company'
+    import { employeesTool } from '@/apis/interfaces/employees'
 	import boss from '@/components/store-boss/store-boss'
 	import staff from '@/components/store-staff/store-staff'
 	import userAuth from '@/public/userAuth'
@@ -75,11 +76,20 @@
 				certification: false,
 				employee	 : false,
 				workbench	 : {},
-				company		 : {}
+				company		 : {},
+                toolList     : ''
 			}
 		},
 		onShow(){
 			this.getIndex()
+            // 获取员工管理列表
+            if(this.$store.state.token != ''){
+            	if(!this.employee) {
+            	    employeesTool().then(res=>{
+            	        this.toolList = res.permission
+            	    })
+            	}
+            }
 		},
 		methods: {
 			// 首页数据

pages/vip/index.vue

@@ -1,5 +1,24 @@
 <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="item" :class="{'show': index === tabsIndex}" v-for="(item, index) in identities" :key="index" @click="onTabs(index)">{{item.name}}</view>
@@ -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;

scss/globa.scss

@@ -10,6 +10,8 @@ $text-color: #333;
 $text-gray: #555;
 $text-gray-m: #999;
 $text-price: #e93340;
+$main-color: #e93340;
+$main-color-light: #e93340;
 
 // 边框颜色
 $border-color: #ddd;
@@ -71,6 +73,45 @@ $padding: 30rpx;
 	-webkit-line-clamp: 2;
 }
 
+.ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.ellipsis-2 {
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.ellipsis-3 {
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+}
+
+.ellipsis-4 {
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 4;
+}
+
+.ellipsis-5 {
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 5;
+}
+
+
 // 修改nvtab
 $mainColor: white;
 

uniCloud-aliyun/cloudfunctions/phone-login/index.js

@@ -1,37 +0,0 @@
-
-'use strict';
-
-const crypto = require('crypto')
-
-exports.main = async (event) => {
-	const secret = 'Yuzhankeji2021.'
-	const hmac = crypto.createHmac('sha256', secret);
-	
-	let params = event.queryStringParameters
-	const sign = params.sign
-	delete params.sign
-	
-	const signStr = Object.keys(params).sort().map(key => {
-		return `${key}=${params[key]}`
-	}).join('&')
-
-	hmac.update(signStr);
-	
-	if (sign !== hmac.digest('hex')) {
-		throw new Error('非法访问')
-	}
-
-	const {
-	    access_token,
-	    openid
-	} = params
-
-	return await uniCloud.getPhoneNumber({
-		appid: '__UNI__CD19AAD',
-		provider: 'univerify',
-		apiKey: '16fa20236696596869759d3a81541901',
-		apiSecret: 'fca97287360c2e8f8259d8877a601887',
-		access_token: access_token,
-		openid: openid,
-	})
-};

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":["\u003cuses-feature android:name\u003d\"android.hardware.camera\"/\u003e","\u003cuses-feature android:name\u003d\"android.hardware.camera.autofocus\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.ACCESS_NETWORK_STATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.ACCESS_WIFI_STATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.CAMERA\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.CHANGE_NETWORK_STATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.CHANGE_WIFI_STATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.FLASHLIGHT\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.MODIFY_AUDIO_SETTINGS\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.READ_LOGS\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.READ_PHONE_STATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.VIBRATE\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.WAKE_LOCK\"/\u003e","\u003cuses-permission android:name\u003d\"android.permission.WRITE_SETTINGS\"/\u003e"]},"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格式文件"}}}},"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"},"launch_path":"__uniappview.html","arguments":"{\"pathName\":\"pages/goods/management\",\"query\":\"\"}"}}
+{"@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"}}