merge

.gitignore

@@ -0,0 +1 @@
+unpackage

apis/interfaces/coupon.js

@@ -33,7 +33,7 @@ const getCouponsInfoById = (id) => {
 // 根据企业id获取企业首页的轮播图列表
 const couponsByCompanyId = (data) => {
   return request({
-    url: 'coupons',
+    url: 'coupons/all',
     method: 'get',
     data: data
   })

apis/interfaces/mine.js

@@ -0,0 +1,97 @@
+/**
+ * Web-zdx
+ * moduleName:个人中心相关操作
+ */
+
+import request from '../request.js'
+
+// 关注店铺
+const shopSubscribe = (id) => {
+  return request({
+    url: 'mall/shops/subscribe/' + id,
+    method: 'POST'
+  })
+}
+
+// 我的关注店铺列表
+const shopSubscribeList = (page) => {
+  return request({
+    url: 'mall/shops/subscribe',
+    method:'get',
+    data:{
+      page:page
+    }
+  })
+}
+
+// 关于我们
+const aboutUs = () => {
+  return request({
+    url: 'articles/about'
+  })
+}
+
+// 获取用户信息
+const getUserInfo = () => {
+  return request({
+    url: 'user/app'
+  })
+}
+
+// 获取用户设置中心的信息
+const getUserSettingInfo = () => {
+  return request({
+    url: 'user/setting'
+  })
+}
+
+// 账号余额等信息
+const chaineb = (data) => {
+  return request({
+    url: 'user/account/chaineb',
+    method:'get',
+    data:data
+  })
+}
+
+// 我的足迹
+const browsers = (page) => {
+  return request({
+    url: 'mall/goods/browsers',
+    method: 'get',
+    data: {
+      page:page,
+	  page_size:20
+    }
+  })
+}
+
+// 修改用户头像或昵称
+const resetUserInfo= (data) => {
+  return request({
+    url: 'user/'+data.key,
+    method: 'PUT',
+    data:{
+		value:data.value
+	}
+  })
+}
+
+// 我的推广码
+const appcode = () => {
+  return request({
+    url: 'user/appcode'
+  })
+}
+
+export {
+  shopSubscribe,
+  shopSubscribeList,
+  aboutUs,
+  getUserInfo,
+  getUserSettingInfo,
+  chaineb,
+  browsers,
+  resetUserInfo,
+  appcode
+}

apis/interfaces/numberWeight.js

@@ -13,6 +13,7 @@ const mallWarrants = (data) => {
     data: data
   })
 }
+
 // 我的数权Id获取数权详情
 const mallWarrantsList = (symbol) => {
   return request({
@@ -23,6 +24,7 @@ const mallWarrantsList = (symbol) => {
 	}
   })
  }
+ 
 // 确认提货
 const mallWarrantsSure = (data) => {
   return request({
@@ -31,6 +33,7 @@ const mallWarrantsSure = (data) => {
     data: data
   })
 }
+
 // 我的邮寄订单，我的提货单
 const mallShipmentsPostShop = (apiUrl,data) => {
   return request({
@@ -39,6 +42,7 @@ const mallShipmentsPostShop = (apiUrl,data) => {
     data: data
   })
 }
+
 // 根据提货单的no 获取提货单的详情
 const mallShipmentsInfo = (no) => {
   return request({
@@ -46,6 +50,7 @@ const mallShipmentsInfo = (no) => {
     method: 'GET'
   })
 }
+
 // 取消提货单
 const mallShipmentsCancel = (shipmentNo) => {
   return request({
@@ -103,6 +108,7 @@ const mallRefundsInfo = (no) => {
     method: 'GET'
   })
 }
+
 // 确认退货mall/refunds/{refund}/deliver
 const mallRefundsDeliver = (data) => {
   return request({

components/coupon-template/coupon-template-1.vue

@@ -21,12 +21,10 @@
 						<view class="coupon-right-des" v-if='item.type.value === 2'>{{item.price_text}}</view>
 						<view class="coupon-right-day">剩余{{item.time.expire}}天</view>
 					</view>
-					<view class="coupon-to-used" @click="$router.push({name:'CouponDetail',query:{id:item.coupon_grant_id}})">
+					<view class="coupon-to-used" @click="couponDetailGo(item.coupon_grant_id)">	去使用 </view>
-						去使用
-					</view>
 				</view>
 			</view>
-			<view class="check-all" v-if="item.coupon_count>2" @click="$router.push({name:'CouponMoreList',	query:{id:item.coupon_id}})">
+			<view class="check-all" v-if="item.coupon_count>2" @click="couponMoreListGo(item.coupon_id)">
 				查看全部{{item.coupon_count}}张优惠券 <uni-icons type="arrowright" size="16" color="#cacaca"></uni-icons>
 			</view>
 			<!-- 已使用未使用标识 -->
@@ -34,7 +32,7 @@
 			<image class="used" v-if="item.status.status === 3" src="/static/images/has_un_used.png" mode="widthFix" />
 			<view class="has-used-bg" v-if="item.status.status === 2 || item.status.status === 3"></view>
 		</view>
-
+  
 		<!-- <u-toast ref="uToast" /> -->
 		<u-toast ref="uToast" />
 	</view>
@@ -54,11 +52,26 @@
 			return {
 
 			};
+		},
+		methods:{
+			couponDetailGo(id) {
+				// this.$router.push({name: 'CouponDetail', query: {id: id}})
+				uni.navigateTo({
+					url:'/pages/property/coupon/detail?id='+id
+				})
+			},
+			couponMoreListGo(id) {
+				// this.$router.push({name:'CouponMoreList', query:{id: id}})
+				uni.navigateTo({
+					url:  '/pages/property/coupon/couponMore?id='+id
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	$padding:20rpx;
 	.coupon-item {
 		margin: $padding $padding;
 		position: relative;

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

@@ -17,7 +17,7 @@
 					<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>x {{item.qty}}</span> </view>
 				<!-- <view class="sku">提货方式 <span> {{item.type_text}}</span> </view> -->
 			</view>
 		</view>

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

@@ -18,8 +18,9 @@
           <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>x {{item.qty}}</span> </view>
-        <view class="sku">提货方式 <span>  {{item.type_text}}</span> </view>
+        <view class="sku" v-if="item.goods_type  === 2">使用方式 <span>  门店使用</span> </view>
+        <view class="sku" v-else>提货方式 <span>  {{item.type_text}}</span> </view>
       </view>
     </view>
   </view>

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

@@ -18,7 +18,7 @@
           <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 class="sku">权证个数 <span>x {{item.account.balance}}</span> </view>
       </view>
     </view>
   </view>

pages.json

@@ -139,6 +139,70 @@
 				"navigationBarBackgroundColor": "#e93340",
 				"navigationBarTitleText": "优惠券详情"
 			}
+		},{
+			"path": "pages/property/collection/collection",
+			"name": "Collection",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "收藏的企业"
+			}
+		},{
+			"path": "pages/property/historyShop/historyShop",
+			"name": "HistoryShop",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "我的足迹"
+			}
+		},{
+			"path": "pages/property/order/servicesOrder",
+			"name": "ServicesOrder",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "已使用订单"
+			}
+		},{
+			"path": "pages/property/order/servicesOrderInfo",
+			"name": "ServicesOrderInfo",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "订单详情"
+			}
+		},{
+			"path": "pages/property/setting/setting",
+			"name": "Setting",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "设置中心"
+			}
+		},{
+			"path": "pages/property/eb",
+			"name": "Eb",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#f40c50",
+				"navigationBarTitleText": "我的EB"
+			}
+		},
+		{
+			"path": "pages/property/record",
+			"name": "Record",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#f40c50",
+				"navigationBarTitleText": "我的零钱"
+			}
 		},
 		{
 			"path": "pages/goods/details",
@@ -340,6 +404,16 @@
 				"navigationBarTitleText": "优惠券"
 			}
 		}, {
+			"path": "pages/coupons/couponList",
+			"name": "Coupons",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom",
+				"backgroundColor": "#e93340"
+			}
+		}, 
+		{
 			"path": "pages/coupons/management",
 			"name": "CouponsMag",
 			"style": {
@@ -378,13 +452,17 @@
 			"path": "pages/verification/index",
 			"name": "Verification",
 			"style": {
-				"navigationBarTitleText": "扫码验证"
+				"navigationBarTitleText": "扫码验证",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#f40c50"
 			}
 		}, {
 			"path": "pages/verification/details",
 			"name": "VerificationDetails",
 			"style": {
-				"navigationBarTitleText": "核销券详情"
+				"navigationBarTitleText": "核销券详情",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#f40c50"
 			}
 		}, {
 			"path": "pages/shop/lists",

pages/equity/index.vue

@@ -142,7 +142,7 @@
 				<view class="title">
 					限时抢购<text>海量商家优惠券</text>
 				</view>
-				<navigator class="more" url="#">查看更多</navigator>
+				<navigator class="more" url="/pages/coupons/couponList">查看更多</navigator>
 			</view>
 			<view class="coupons" v-if="coupons.length > 0">
 				<view class="coupons-item" v-for="(item, index) in coupons" :key="index">

pages/order/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 = e.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/collection/collection.vue

@@ -0,0 +1,217 @@
+<template>
+  <view class="Collect-list">
+    <!--有收藏的店铺 -->
+    <view class="list-item" v-if="lists.length>0" v-for="(item,index) in lists" :key="index">
+      <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="urate">
+              <u-rate :current="item.star" size="28rpx" :disabled="true"></u-rate>
+            </view>
+            <view class="des">销量:<span>100</span>件 <span> </span> 库存:<span>2524</span>件</view>
+          </view>
+        </view>
+        <view class="list-top-right" @click="onOpenWechat(item)">进店逛逛</view>
+      </view>
+      <view class="list-bottom">
+        <view class="list-bottom-item" v-for="(it,idx) in item.goods" :key='idx'>
+          <image class="goods-img" :src="it.cover" mode="aspectFill" @click="goGoods(it.goods_id)"></image>
+          <view class="money">￥ {{it.price.price_min}}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 没有收藏的店铺 -->
+    <no-list name='no-shop' v-if="lists.length === 0" txt="您还没有收藏任何企业哦~" />
+
+    <!-- <u-toast ref="uToast" /> -->
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import {
+    shopSubscribeList
+  } from '@/apis/interfaces/mine'
+  export default {
+    data() {
+      return {
+        lists: [],
+        page: 1,
+        has_more: true,
+      };
+    },
+
+    onLoad(e) {
+      this.getList()
+    },
+    onReachBottom() {
+      if (this.has_more) {
+        this.page = this.page + 1
+        this.getGoodsByCompanyidCaregoryid()
+      } else {
+        this.$refs.uToast.show({
+          title: '吼吼吼~我是有底的~',
+          type: 'primary',
+          duration: 3000
+        })
+      }
+    },
+    methods: {
+      // 获取列表
+      getList() {
+        shopSubscribeList(this.page).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
+          }
+        }).catch(err => {
+          this.$refs.uToast.show({
+            title: err.message,
+            type: 'primary',
+            duration: 3000
+          })
+        })
+      },
+	  // 打开微信小程序
+	  onOpenWechat(e){
+	  	plus.share.getServices(res => {
+	  		let sweixin = null;
+	  		for(let val of res){
+	  			if(val.id === 'weixin'){
+	  				sweixin = val
+	  			}
+	  		}
+	  		/**  以此为例子 显示跳转引导页     
+	  		*    'index_4'
+	  		*     index   跳小程序企业首页
+	  		*     4       企业id
+	  		**/
+	  		if(sweixin != null){
+	  			sweixin.launchMiniProgram({
+	  				id	: e.original_id,
+	  				path: 'pages/login/guide?scene=index_' + e.company_id,
+	  			})
+	  		}else{
+	  			uni.showToast({
+	  				title: '当前环境不支持打开微信小程序',
+	  				icon : 'none'
+	  			})
+	  		}
+	  	})
+	  },
+      // 跳转商城
+      goShop(company_id) {
+        uni.setStorageSync('company_id', company_id)
+        uni.setStorageSync('refresh',true)
+        this.$Router.pushTab({
+          name: 'Goods'
+        })
+      },
+      goGoods(id) {
+		this.$Router.push({name: 'goodsDetails', query: {id: id}})
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .Collect-list {
+    .list-item {
+      border-top: solid 20rpx #F7F7F7;
+      padding: 0 30rpx 30rpx 30rpx;
+
+      .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;
+
+        .list-top-left {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: flex-start;
+          box-sizing: border-box;
+
+          .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-bottom {
+        margin-top: 20rpx;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        // padding: 0 30rpx;
+
+        .list-bottom-item {
+          width: 160rpx;
+          height: 160rpx;
+          position: relative;
+
+          .goods-img {
+            width: 100%;
+            height: 100%;
+          }
+
+          .money {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            background-color: rgba($color: #000000, $alpha: 0.5);
+            color: #fff;
+            padding: 2rpx 8rpx;
+            font-size: $title-size *0.9;
+          }
+        }
+      }
+    }
+  }
+</style>

pages/property/coupon/couponMore.vue

@@ -2,7 +2,7 @@
 	<view class="Coupon">
 		<!-- 有优惠券列表 -->
 		<view class="coupon-content">
-			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" />
+			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" :action="actions" />
 		</view>
 
 		<!-- 没有优惠券列表 -->
@@ -34,7 +34,7 @@
 		},
 		onLoad(e) {
 			console.log(e)
-			this.id = this.$route.query.id
+			this.id = e.id
 			this.getMyCoupon()
 		},
 		onShow() {
@@ -56,6 +56,7 @@
 		  } else {
 		    this.$refs.uToast.show({
 		      title: '吼吼吼~我是有底的~',
+		      type: 'primary',
 		      duration: 3000
 		    })
 		  }
@@ -80,9 +81,9 @@
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,
+						type: 'primary',
 						duration: 3000
 					})
-					
 				})
 			},
 			// 选择顶部菜单
@@ -124,7 +125,6 @@
 		min-height: 100vh;
 		box-sizing: border-box;
 		background-color: #F7F7F7;
-		padding-bottom: 20rpx;
 
 		.coupon-nav {
 			display: flex;

pages/property/coupon/detail.vue

@@ -12,9 +12,9 @@
 		<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}})" />
+			<image :src="item.cover" mode="aspectFill" class="goods-img" @click="goDetail(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-title ellipsis-2"  @click="goDetail(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>
@@ -67,8 +67,7 @@
 			GoodTemplate
 		},
 		onLoad(e) {
-			console.log(this.$route)
+			this.coupon_grant_id = e.id
-			this.coupon_grant_id = this.$route.query.id
 			this.getList()
 		},
 		methods: {
@@ -87,16 +86,14 @@
 			},
 			// 点击立即购买去商品确认页面
 			nowBuy(items) {
-				console.log(items, 'items....')
+				uni.navigateTo({
-				let data = {
+					url:'/pages/order/buy?qty=1&skuId='+items.goods_sku_id,
-					skuId: items.goods_sku_id,
+				})
-					qty: 1
+			},
-				}
+			goDetail(id){
-				this.$router.push({
+				uni.navigateTo({
-					name: 'Buy',
+					url:'/pages/goods/details?id='+id
-					params: data
 				})
-				console.log(data)
 			},
 			// 点击二维码特效
 			clickCode(grantid) {
@@ -152,7 +149,7 @@
 
 		// 优惠券
 		.coupon {
-			margin: 0 $margin * 2;
+			margin: 0 $margin;
 			background-color: #Fff;
 			position: relative;
 			z-index: 1;
@@ -182,7 +179,7 @@
 		// 可用商品
 		.goods-item {
 			background-color: #fff;
-			margin: $margin*1.5 $margin * 2;
+			margin: $margin*1.5 $margin;
 			border-radius: 20rpx;
 			display: flex;
 			flex-direction: row;
@@ -237,18 +234,18 @@
 			font-size: 34rpx;
 			font-weight: bold;
 			text-align: left;
-			margin: $margin*2;
+			margin: $margin $margin;
 			// text-shadow:10rpx 10rpx linear-gradient(to right, #f39e17, #f85b05);
 			text-shadow: 2rpx 2rpx 10rpx $main-color;
 		}
 
 		// 描述
 		.describe {
-			margin: $margin * 2 0;
+			margin: $margin 0;
 
 			.describe-des {
 				color: #999;
-				padding: 10rpx $margin * 2;
+				padding: 10rpx $margin ;
 				font-size: 28rpx;
 			}
 		}

pages/property/eb.vue

@@ -1,22 +1,327 @@
 <template>
-	<view>
+	<view class="Record">
-		eb账户
+		<view class="record-top">
+			<image src="/static/images/record_bg.png" mode="widthFix" class="record-bg" />
+			<view class="record-top-nav">
+				<view :class="['record-top-item',type==='year'?'selectTopItem':'']" @click="selectType('year')">年账单</view>
+				<view :class="['record-top-item',type==='month'?'selectTopItem':'']" @click="selectType('month')">月账单</view>
+				<view :class="['record-top-item',type==='day'?'selectTopItem':'']" @click="selectType('day')">日账单</view>
+			</view>
+			<view class="record-mouth-year">
+				<view class="record-type-left">
+					<u-picker mode="time" v-model="show" :params="params" @confirm ='confirm' title ='筛选日期' start-year='2021' :end-year='currentYear'/>
+					<view @click="show = true">
+						{{date?date:'选择日期'}}
+						<uni-icons type="arrowdown" color="#fff" size="12" />
+					</view>
+				</view>
+				<view class="record-type-right">
+					<view :class="['pay_type_item',cointype==='in'?'pay_type_item_select':'']" @click="selectCoinType('in')">收入</view>
+					<view :class="['pay_type_item',cointype==='out'?'pay_type_item_select':'']" @click="selectCoinType('out')">支出</view>
+				</view>
+			</view>
+			<view class="record-title">可用额度 ( EB ) </view>
+			<view class="record-money"><span>￥</span>{{account}} <span></span></view>
+		<!-- 	<view class="">待解锁额度</view>
+			<view class="">授信额度</view> -->
+		</view>
+		
+		<!-- 列表。。。 -->
+		<view class="record-list" v-if="lists.length>0">
+			<view class="record-list-item" v-for="(item,index) in lists" :key='index'>
+				<view class="record-list-item-top">
+					<view class="title">{{item.note}}</view>
+					<view class="money">{{cointype==='in'?'+':'-'}}{{item.amount}} </view>
+				</view>
+				<view class="record-list-item-date">{{item.blockTime}}</view>
+			</view>
+		</view>
+		<!-- 无列表 -->
+		<no-list v-if="lists.length === 0 && cointype === 'in'" name='no-in' txt="没有任何收入记录" />
+		<no-list v-if="lists.length === 0 && cointype === 'out'" name='no-out' txt="没有任何支出记录" />
+		
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
+	import {chaineb} from '@/apis/interfaces/mine';
 	export default {
 		data() {
 			return {
-				
+				lists:[],
+				has_next_page:true,
+				page:1,
+				type:'year', // 统计类型day日，month月，year年
+				cointype:'in',// in 收入 out 支出
+				date:new Date().toISOString().slice(0,4), // 日：Y-m-d，月Y-m，年Y
+				params: {
+					year: true,
+					month: true,
+					day: true
+				},
+				show: false, // 显示
+				currentDay:new Date().toISOString().slice(0,10),
+				currentMonth:new Date().toISOString().slice(0,7),
+				currentYear:new Date().toISOString().slice(0,4),
+				account:''
+			}
+		},
+		onLoad(){
+			this.getList()
+		},
+		onReachBottom(){
+			if (this.has_next_page) {
+			  this.page = this.page + 1
+			  this.getList()
+			} else {
+			  this.$refs.uToast.show({
+			    title: '吼吼吼~我是有底的~',
+			    type: 'error',
+			    icon:false,
+			    duration: 3000
+			  })
 			}
 		},
 		methods: {
-			
+			// 获取列表
+			getList(){
+				let data = {
+					page:this.page,
+					type:this.type,
+					date:this.date,
+					cointype:this.cointype
+				}
+				chaineb(data).then(res => {
+					console.log(res)
+					this.account = res.account
+					this.lists = this.lists.concat(res.lists)
+					this.has_next_page = res.has_next_page
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon:false,
+						duration: 3000
+					})
+				})
+			},
+			selectCoinType(type){
+				if(this.cointype !== type){
+					this.cointype = type
+					this.reset()
+				}
+			},
+			// 重置
+			reset(){
+				this.page = 1
+				this.lists = []
+				this.has_next_page = true
+				this.getList()
+			},
+			// 选择 年  月  日 切换要重置数据
+			selectType(type){
+				console.log(type,typeof type)
+				if(this.type !== type){
+					switch(type){
+						case 'year':
+							this.type = type
+							this.params= {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentYear
+							this.reset()
+							break;
+						case 'month':
+							this.type = type
+							this.params= {
+								year: true,
+								month: true,
+								day: false
+							}
+							this.date = this.currentMonth
+							this.reset()
+							break;
+						case 'day':
+							this.type = type
+							this.params= {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentDay
+							this.reset()
+							break;
+					}
+				}
+			},
+			// 点击确认按钮
+			confirm(e){
+				let type = this.type
+				switch(type){
+					case 'year':
+						this.date = e.year
+						this.reset()
+						break;
+					case 'month':
+						this.date = e.year + '-' + e.month
+						this.reset()
+						break;
+					case 'day':
+						this.date = e.year + '-' + e.month + '-' + e.day
+						this.reset()
+						break;
+				}
+			}
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	page {
+		background-color: #f7f7f7;
+	}
 
+	.Record {
+		width: 100%;
+		height: 100vh;
+		padding-top: 30rpx;
+		background-color: #fff;
+	}
+
+	.record-top {
+		width: calc(100% - 60rpx);
+		height: 360rpx;
+		background-image: linear-gradient(to left, #f40c50 , #f40c50);
+		box-shadow: 0 10rpx 20rpx 0rpx rgba($color: $main-color, $alpha: 0.4);
+		margin: 0 30rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		position: relative;
+		padding: 10rpx 50rpx 20rpx 50rpx;
+		z-index: 1;
+
+		.record-bg {
+			position: absolute;
+			width: 230rpx;
+			bottom: 0;
+			right: 30rpx;
+			z-index: 1;
+		}
+
+		.record-top-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+
+			.record-top-item {
+				margin: 40rpx 20rpx;
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+			.selectTopItem{
+				border-bottom: solid 4rpx #fff;
+			}
+		}
+
+		.record-mouth-year {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 2;
+			color: #fff;
+			font-size: 30rpx;
+
+			.record-type-left {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+
+				uni-icons {
+					margin-left: 4rpx;
+				}
+			}
+
+			.record-type-right {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				font-size: 24rpx;
+
+				.pay_type_item {
+					margin: 0 10rpx;
+					padding: 2rpx 20rpx;
+					border-radius: 30rpx;
+					border: solid 1rpx rgba($color: #000000, $alpha: 0);
+				}
+				.pay_type_item_select{
+					border: solid 1rpx #f7f7f7;
+				}
+			}
+		}
+
+		.record-title {
+			font-size: 28rpx;
+			color: #fff;
+			padding: 20rpx 0;
+		}
+
+		.record-money {
+			color: #fff;
+			font-size: 50rpx;
+			font-weight: bold;
+
+			span {
+				font-size: 30rpx;
+				font-weight: 400;
+				margin-right: 4rpx;
+			}
+		}
+	}
+
+	.record-list {
+		padding: 20rpx 30rpx;
+
+		.record-list-item {
+			padding: 20rpx 0;
+			border-bottom: solid 1rpx #f7f7f7;
+			.record-list-item-top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+
+				.title {
+					font-size: 30rpx;
+					width: 400rpx;
+				}
+
+				.money {
+					color: #f40c50;
+					font-size: 34rpx;
+					font-weight: bold;
+				}
+			}
+
+			.record-list-item-date {
+				font-size: 24rpx;
+				color: #a6a6a6;
+				margin-top: 10rpx;
+			}
+		}
+	}
 </style>

pages/property/historyShop/historyShop.vue

@@ -0,0 +1,139 @@
+<template>
+  <view class="HistoryList">
+    <!-- 有足迹 -->
+    <view class="goodsList" v-if="lists.length>0">
+      <view class="date">以往足迹</view>
+      <view class="lists">
+        <view class="lists-item" v-for="(item,index) in lists" :key="index" @click="goGoods(item.goods_id)">
+          <image class="goods-img" :src="item.cover" mode="aspectFill" />
+          <view class="money"><span class="tags" v-if='item.tags.length>0'>{{item.tags[0].name}}</span><span>￥</span>{{item.price}}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 没有任何足迹 -->
+    <no-list v-if="lists.length === 0" name='no-foot' txt="您还没有产生任何足迹哦~" />
+
+    <!-- <u-toast ref="uToast" /> -->
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import {
+    browsers
+  } from '@/apis/interfaces/mine'
+  export default {
+    data() {
+      return {
+        lists: [],
+        page: 1,
+        has_more: true
+      }
+    },
+    onLoad() {
+      this.getLists()
+    },
+    onReachBottom() {
+		console.log('this.has_more',this.has_more)
+      if (this.has_more) {
+        this.page = this.page + 1
+        this.getLists()
+      } else {
+        this.$refs.uToast.show({
+          title: '吼吼吼~我是有底的~',
+          duration: 3000
+        })
+      }
+    },
+    methods: {
+      getLists() {
+        browsers(this.page).then(res => {
+		console.log(res)
+          this.lists = this.lists.concat(res.data)
+          this.has_more = res.page.has_more
+        }).catch(err => {
+          this.$refs.uToast.show({
+            title: err.message,
+            type: 'primary',
+            duration: 3000
+          })
+        })
+      },
+      // 跳转到商品详情
+      goGoods(id) {
+        console.log(id)
+        uni.navigateTo({
+          url: '/pages/goods/details?id=' + id
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .HistoryList {
+	  background-color: #fff;
+	  width: 100%;
+	  min-height: 100vh;
+    .goodsList {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: flex-start;
+      box-sizing: border-box;
+      padding: 20rpx 10rpx 20rpx 15rpx;
+      border-bottom: solid 1rpx #f7f7f7;
+
+      .date {
+        margin-left: 10rpx;
+        font-size: $title-size * 1.12;
+        font-weight: bold;
+      }
+
+      .lists {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        box-sizing: border-box;
+        flex-wrap: wrap;
+        width: 100%;
+
+        .lists-item {
+          margin: 20rpx 10rpx 10rpx 10rpx;
+          width: 220rpx;
+
+          .goods-img {
+            width: 220rpx;
+            height: 220rpx;
+            border-radius: 10rpx;
+          }
+
+          .money {
+            color: #FA3534;
+            font-size: $title-size*0.9;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+
+            .tags {
+              background-color: #FA3534;
+              color: #fff;
+              padding: 2rpx 12rpx;
+              border-radius: 6rpx;
+              font-size: $title-size * 0.7 !important;
+              margin-right: 10rpx;
+            }
+
+            span {
+              font-size: $title-size * 0.8;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

pages/property/index.vue

@@ -1,17 +1,17 @@
 <template>
-	<view>
+	<view v-if='loaded'>
 		<!-- 用户信息 -->
 		<view class="user">
-			<view class="user-tool">
+			<view class="user-tool" @click="$Router.push({name:'Setting'})">
-				<image src="@/static/icons/user_icon_00.png" mode="widthFix" />
+				<image src="@/static/icons/user_icon_00.png" mode="widthFix"  />
 			</view>
 			<view class="user-content">
-				<image class="info-cover" src="../../static/dev/good_cover_00.jpg" mode="aspectFill" />
+				<image class="info-cover" :src="base.avatar" mode="aspectFill" />
-				<view class="info-nickname">唐明明</view>
+				<view class="info-nickname">{{base.nickname}}</view>
 				<view class="info-signa">潮流就是我的态度</view>
 				<view class="info-tags">
-					<text class="info-tags-item identity">普通用户</text>
+					<text class="info-tags-item identity">{{base.identity.name}}</text>
-					<text class="info-tags-item vip">PULS企业</text>
+					<text class="info-tags-item vip" v-if="base.company_level.name">{{base.company_level.name }}</text>
 				</view>
 			</view>
 			<view class="user-tabs">
@@ -23,11 +23,8 @@
 		<view class="user-ad">
 			<uni-icons class="user-ad-icon" type="sound-filled" color="#e93340"></uni-icons>
 			<swiper class="user-ad-swiper" :interval="3000" autoplay vertical circular>
-				<swiper-item>
+				<swiper-item v-for="(item,index) in message" :key='index'>
-					<view class="user-ad-item">恭喜用户0101成功开通PLUS企业会员</view>
+					<view class="user-ad-item">{{item}}</view>
-				</swiper-item>
-				<swiper-item>
-					<view class="user-ad-item">恭喜用户0101成功开通PLUS企业会员</view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -38,20 +35,20 @@
 					<view class="title-text">我的资产</view>
 				</view>
 				<view class="group-flex group-flex-4">
-					<view class="item">
+					<view class="item" @click="showToast">
-						<view class="item-num">0</view>
+						<view class="item-num">{{base.account.token}}</view>
 						<view class="item-title">原石</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="showToast">
-						<view class="item-num">0</view>
+						<view class="item-num">{{base.account.contribution}}</view>
 						<view class="item-title">贡献值</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'Eb'})">
-						<view class="item-num">0</view>
+						<view class="item-num">{{base.account.eb}}</view>
 						<view class="item-title">易币</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="showToast">
-						<view class="item-num">0</view>
+						<view class="item-num">{{base.account.money}}</view>
 						<view class="item-title">零钱</view>
 					</view>
 				</view>
@@ -63,19 +60,19 @@
 				</view>
 				<view class="group-flex group-flex-4">
 					<view class="item" @click="$Router.push({name:'NumberWeight'})">
-						<view class="item-num">0</view>
+						<view class="item-num">{{count.warrnats}}</view>
 						<view class="item-title">权证持有</view>
 					</view>
-					<view class="item" @click="$Router.push({name:'33'})">
+					<view class="item" @click="showToast">
-						<view class="item-num">0</view>
+						<view class="item-num">{{count.warrnat_transfer}}</view>
 						<view class="item-title">权证转让</view>
 					</view>
-					<view class="item" @click="$Router.push({name:'334'})">
+					<view class="item" @click="$Router.push({name:'ServicesOrder'})">
-						<view class="item-num">0</view>
+						<view class="item-num">{{count.shipment_fuwu_count}}</view>
 						<view class="item-title">已使用</view>
 					</view>
 					<view class="item" @click="$Router.push({name:'MallShipments'})">
-						<view class="item-num">0</view>
+						<view class="item-num">{{count.shipment_goods_count}}</view>
 						<view class="item-title">已提货</view>
 					</view>
 				</view>
@@ -83,18 +80,18 @@
 			<!-- 我的权证 -->
 			<view class="user-group">
 				<view class="group-flex group-flex-4">
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'Collection'})">
-						<image class="item-cover" src="@/static/icons/user_icon_01.png" mode="aspectFill" />
-						<view class="item-title">商品收藏</view>
-					</view>
-					<view class="item">
 						<image class="item-cover" src="@/static/icons/user_icon_02.png" mode="aspectFill" />
-						<view class="item-title">关注企业</view>
+						<view class="item-title">收藏的企业</view>
 					</view>
 					<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>
+					<view class="item" @click="$Router.push({name:'HistoryShop'})">
+						<image class="item-cover" src="@/static/icons/user_icon_01.png" mode="aspectFill" />
+						<view class="item-title">我的足迹</view>
+					</view>
 					<view class="item" @click="$Router.push({name:'AddressList'})">
 						<image class="item-cover" src="@/static/icons/user_icon_04.png" mode="aspectFill" />
 						<view class="item-title">地址管理</view>
@@ -110,11 +107,11 @@
 				</view>
 				<view class="group-flex group-flex-2">
 					<view class="item">
-						<view class="item-num">0</view>
+						<view class="item-num">{{relations.children}}</view>
 						<view class="item-title">推广人数</view>
 					</view>
 					<view class="item">
-						<view class="item-num">0</view>
+						<view class="item-num">{{relations.company}}</view>
 						<view class="item-title">推广企业</view>
 					</view>
 				</view>
@@ -128,28 +125,32 @@
 				<view class="ranking ranking-after">
                     <view class="ranking-title">
                         <view class="ranking-text">全站推广人数</view>
-                        <view class="ranking-number">5</view>
+                        <view class="ranking-number">{{relations.childrenRank}}</view>
                     </view>
                     <image class="tips" src="../../static/icons/property_icon_00.png" mode="aspectFill" />
 				</view>
                 <view class="ranking">
                     <view class="ranking-title">
                     	<view class="ranking-text">推广企业</view>
-                        <view class="ranking-number">5</view>
+                        <view class="ranking-number">{{relations.companyRank}}</view>
                     </view>
                     <image class="tips" src="../../static/icons/property_icon_01.png" mode="aspectFill" />
                 </view>
 			</view>
+			
             
 			<!-- 推广海报 -->
             <view class="poster-text">推广海报</view>
-			<carousel :img-list="imgList" url-key="url" @selected="selectedBanner"/>
+			
-            
+			<!-- <carousel :img-list="imgList" url-key="url" @selected="selectedBanner"/> -->
-            
+			<view class="code">
-            <view class="" @click="outLogin">
+				<image class="code-img-bg" src="/static/images/share_bg_3.png" mode="aspectFill" />
-                临时退出
+				<image class='code-img' :src="shareCode" mode="widthFix" />
-            </view>
+			</view>
+       
 		</block>
+		<!-- 弹窗 -->
+		<u-toast ref="uToast" />
 		<!-- 版权信息 -->
 		<view class="copyright">易品新境 beta 1.0.0</view>
 	</view>
@@ -157,13 +158,14 @@
 
 <script>
 	import carousel from '@/components/vear-carousel/vear-carousel'
+	import {getUserInfo , appcode} from '@/apis/interfaces/mine'
 	export default {
 		components: {
 			carousel
 		},
 		data() {
 			return {
-				tabsIndex: 1,
+				tabsIndex: 0,
 				imgList: [{
 					url: 'https://img9.51tietu.net/pic/2019-091200/vgkpidei2tjvgkpidei2tj.jpg',
 					id: 1
@@ -173,15 +175,59 @@
 				},{
 					url: 'https://img9.51tietu.net/pic/2019-091200/143tt0ta4sr143tt0ta4sr.jpg',
 					id: 3
-				}]
+				}],
+				base:'',
+				count:'',
+				relations:'',
+				message:'',
+				loaded:false,
+				shareCode:''
 			}
 		},
+		onShow(){
+			this.getUserInfo()
+		},
 		methods: {
+			// 获取用户的基本信息
+			getUserInfo(){
+				getUserInfo().then(res => {
+					this.base = res.base
+					this.count = res.count
+					this.message = res.message
+					this.relations = res.relations
+					this.loaded = true
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon:false,
+						duration: 3000
+					})
+				})
+				appcode().then(res => {
+					this.shareCode = res.code
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon:false,
+						duration: 3000
+					})
+				})
+			},
 			outLogin(){
 				this.$store.commit('setToken', '')
 			},
 			selectedBanner(item, index) {
 				console.log('🥒', item, index)
+			},
+			// 努力开发中，，，
+			showToast(){
+				this.$refs.uToast.show({
+				  title: '努力开发中',
+				  type:'error',
+				  duration: 3000
+				})
 			}
 		}
 	}
@@ -411,13 +457,31 @@
         margin: $margin + 10 0 0;
         text-align: center;
     }
+	.code{
+		width: 700rpx;
+		height: 400rpx;
+		background-color: red;
+		margin: 25rpx;
+		position: relative;
+		.code-img-bg{
+			width: 100%;
+			height: 100%;
+		}
+		.code-img{
+			width: 220rpx;
+			position: absolute;
+			left: 30rpx;
+			top: 50%;
+			margin-top: -90rpx;
+		}
+	}
 	// 易货订单
 	.order-flex{
 		.item{
-			width: calc(20% - #{$padding - 10});
+			width: calc(25% - #{$padding - 10});
 			.item-num{
 				font-weight: bold;
-				font-size: $title-size + 4;
+				font-size: $title-size;
 			}
 			.item-cover{
 				width: 72rpx;

pages/property/order/mallRefund.vue

@@ -60,7 +60,7 @@
 		    id: 'signed'
 		  },
 		  {
-		    name: '待退数权',
+		    name: '待退权证',
 		    id: 'process'
 		  },
 		  {
@@ -136,7 +136,7 @@
 			console.log(index,no)
 			uni.showModal({
 			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 			    success:  (res) =>{
 			        if (res.confirm) {
 			            mallShipmentsCancel(no).then(res=>{

pages/property/order/mallRefundsInfo.vue

@@ -38,7 +38,7 @@
 						<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 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'>

pages/property/order/mallShipments.vue

@@ -139,7 +139,7 @@
 								id: 'signed'
 							},
 							{
-								name: '待退数权',
+								name: '待确认退货',
 								id: 'process'
 							},
 							{
@@ -216,6 +216,7 @@
 					apiUrl = 'mall/shipments/post'
 				} else if(this.selectTypeId === 'take') {
 					apiUrl = 'mall/shipments/shop'
+					data.channel = 'app'
 				} else if(this.selectTypeId === 'refund') {
 					apiUrl = 'mall/refunds'
 				}
@@ -238,7 +239,7 @@
 				console.log(index, no)
 				uni.showModal({
 					title: '哎呦，提醒你',
-					content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+					content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 					success: (res) => {
 						if (res.confirm) {
 							mallShipmentsCancel(no).then(res => {

pages/property/order/mallShipmentsInfo.vue

@@ -38,7 +38,7 @@
             <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 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'>
@@ -135,7 +135,7 @@
 		nowCancel(no){
 			uni.showModal({
 			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 			    success:  (res) =>{
 			        if (res.confirm) {
 			            mallShipmentsCancel(no).then(res=>{

pages/property/order/servicesOrder.vue

@@ -0,0 +1,237 @@
+<template>
+  <view class="NumberWeight">
+	  <!-- 订单分类 -->
+	  <view class="nav" >
+	    <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 ==='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>
+	  
+    <!-- 有订单列表 -->
+    <block v-if="lists.length > 0">
+      <!-- 订单列表 -->
+      <view class="order-list" v-for="(item,index) in lists" :key="index">
+        <MallShipmentsTemplate :item="item" />
+        <view class="actions">
+          <view class="nowPay" @click="goDetail(item.shipment_no)" >查看详情</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 { mallShipmentsPostShop , mallShipmentsSign , mallShipmentsCancel } from '@/apis/interfaces/numberWeight'
+  export default {
+    components: {
+      MallShipmentsTemplate
+    },
+    data() {
+      return {
+        lists: [],
+		page:1,
+		total:0,
+		navList: [],
+		type:'',// post 快递单  空为自提单
+		selectNavId: 'signed',
+		count:{},// 订单数量
+      };
+    },
+	onLoad(e) {
+		this.navList = [
+			{
+				name: '已使用',
+				id: 'signed'
+			},
+			{
+				name: '已完成',
+				id: 'completed'
+			}
+		]
+		this.selectNavId = 'signed'
+		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: '吼吼吼~我是有底的~',
+			  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:4,
+				page:this.page,
+				state:this.selectNavId
+			}
+			let apiUrl = ''
+			apiUrl = 'mall/shipments/service'
+			data.channel = 'app'
+			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,
+				  duration: 3000
+				})
+			})
+		},
+	
+		// 查看详情
+		goDetail(no){
+			uni.navigateTo({
+				url:'/pages/property/order/servicesOrderInfo?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;
+      }
+    }
+
+    // 订单列表
+    .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/servicesOrderInfo.vue

@@ -0,0 +1,594 @@
+<template>
+	<view class="OrderInfo" v-if="loaded">
+		<!-- 订单状态 -->
+		<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/details?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> x {{info.qty}}</span></view>
+			<view class="goods-type">使用方式<span>门店使用</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>
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		mallShipmentsInfo
+	} 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,
+				loaded: false,
+				shipment_no: '', // 提货单no
+			};
+		},
+		onLoad(e) {
+			console.log(e)
+			this.shipment_no = e.no
+			this.getInfo(e.no)
+			console.log(this.shipment_no)
+			// this.getInfo('2021081817410747800300000004')
+		},
+		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 + ''
+					this.loaded = true
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'primary',
+						duration: 3000
+					})
+				})
+			},
+			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/record.vue

@@ -0,0 +1,326 @@
+<template>
+	<view class="Record">
+		<view class="record-top">
+			<image src="/static/images/record_bg.png" mode="widthFix" class="record-bg" />
+			<view class="record-top-nav">
+				<view :class="['record-top-item',type==='year'?'selectTopItem':'']" @click="selectType('year')">年账单</view>
+				<view :class="['record-top-item',type==='month'?'selectTopItem':'']" @click="selectType('month')">月账单</view>
+				<view :class="['record-top-item',type==='day'?'selectTopItem':'']" @click="selectType('day')">日账单</view>
+			</view>
+			<view class="record-mouth-year">
+				<view class="record-type-left">
+					<u-picker mode="time" v-model="show" :params="params" @confirm ='confirm' title ='筛选日期' start-year='2021' :end-year='currentYear'/>
+					<view @click="show = true">
+						{{date?date:'选择日期'}}
+						<uni-icons type="arrowdown" color="#fff" size="12" />
+					</view>
+				</view>
+				<view class="record-type-right">
+					<view :class="['pay_type_item',cointype==='in'?'pay_type_item_select':'']" @click="selectCoinType('in')">收入</view>
+					<view :class="['pay_type_item',cointype==='out'?'pay_type_item_select':'']" @click="selectCoinType('out')">支出</view>
+				</view>
+			</view>
+			<view class="record-title">可用额度</view>
+			<view class="record-money"><span>￥</span>{{account}}</view>
+		<!-- 	<view class="">待解锁额度</view>
+			<view class="">授信额度</view> -->
+		</view>
+		
+		<!-- 列表。。。 -->
+		<view class="record-list" v-if="lists.length>0">
+			<view class="record-list-item" v-for="(item,index) in lists" :key='index'>
+				<view class="record-list-item-top">
+					<view class="title">{{item.note}}</view>
+					<view class="money">{{cointype==='in'?'+':'-'}}{{item.amount}}</view>
+				</view>
+				<view class="record-list-item-date">{{item.blockTime}}</view>
+			</view>
+		</view>
+		<!-- 无列表 -->
+		<no-list v-if="lists.length === 0 && cointype === 'in'" name='no-in' txt="没有任何收入记录" />
+		<no-list v-if="lists.length === 0 && cointype === 'out'" name='no-out' txt="没有任何支出记录" />
+		
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {chaineb} from '@/apis/interfaces/mine';
+	export default {
+		data() {
+			return {
+				lists:[],
+				has_next_page:true,
+				page:1,
+				type:'year', // 统计类型day日，month月，year年
+				cointype:'in',// in 收入 out 支出
+				date:new Date().toISOString().slice(0,4), // 日：Y-m-d，月Y-m，年Y
+				params: {
+					year: true,
+					month: true,
+					day: true
+				},
+				show: false, // 显示
+				currentDay:new Date().toISOString().slice(0,10),
+				currentMonth:new Date().toISOString().slice(0,7),
+				currentYear:new Date().toISOString().slice(0,4),
+				account:''
+			}
+		},
+		onLoad(){
+			this.getList()
+		},
+		onReachBottom(){
+			if (this.has_next_page) {
+			  this.page = this.page + 1
+			  this.getList()
+			} else {
+			  this.$refs.uToast.show({
+			    title: '吼吼吼~我是有底的~',
+			    type: 'error',
+			    icon:false,
+			    duration: 3000
+			  })
+			}
+		},
+		methods: {
+			// 获取列表
+			getList(){
+				let data = {
+					page:this.page,
+					type:this.type,
+					date:this.date,
+					cointype:this.cointype
+				}
+				chaineb(data).then(res => {
+					console.log(res)
+					this.account = res.account
+					this.lists = this.lists.concat(res.lists)
+					this.has_next_page = res.has_next_page
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'error',
+						icon:false,
+						duration: 3000
+					})
+				})
+			},
+			selectCoinType(type){
+				if(this.cointype !== type){
+					this.cointype = type
+					this.reset()
+				}
+			},
+			// 重置
+			reset(){
+				this.page = 1
+				this.lists = []
+				this.has_next_page = true
+				this.getList()
+			},
+			// 选择 年  月  日 切换要重置数据
+			selectType(type){
+				console.log(type,typeof type)
+				if(this.type !== type){
+					switch(type){
+						case 'year':
+							this.type = type
+							this.params= {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentYear
+							this.reset()
+							break;
+						case 'month':
+							this.type = type
+							this.params= {
+								year: true,
+								month: true,
+								day: false
+							}
+							this.date = this.currentMonth
+							this.reset()
+							break;
+						case 'day':
+							this.type = type
+							this.params= {
+								year: true,
+								month: false,
+								day: false
+							}
+							this.date = this.currentDay
+							this.reset()
+							break;
+					}
+				}
+			},
+			// 点击确认按钮
+			confirm(e){
+				let type = this.type
+				switch(type){
+					case 'year':
+						this.date = e.year
+						this.reset()
+						break;
+					case 'month':
+						this.date = e.year + '-' + e.month
+						this.reset()
+						break;
+					case 'day':
+						this.date = e.year + '-' + e.month + '-' + e.day
+						this.reset()
+						break;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f7f7f7;
+	}
+
+	.Record {
+		width: 100%;
+		height: 100vh;
+		padding-top: 30rpx;
+	}
+
+	.record-top {
+		width: calc(100% - 60rpx);
+		height: 360rpx;
+		background-image: linear-gradient(to left, #f40c50 , #f40c50);
+		box-shadow: 0 10rpx 20rpx 0rpx rgba($color: $main-color, $alpha: 0.4);
+		margin: 0 30rpx;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		position: relative;
+		padding: 10rpx 50rpx 20rpx 50rpx;
+		z-index: 1;
+
+		.record-bg {
+			position: absolute;
+			width: 230rpx;
+			bottom: 0;
+			right: 30rpx;
+			z-index: 1;
+		}
+
+		.record-top-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+
+			.record-top-item {
+				margin: 40rpx 20rpx;
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #fff;
+			}
+			.selectTopItem{
+				border-bottom: solid 4rpx #fff;
+			}
+		}
+
+		.record-mouth-year {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 2;
+			color: #fff;
+			font-size: 30rpx;
+
+			.record-type-left {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+
+				uni-icons {
+					margin-left: 4rpx;
+				}
+			}
+
+			.record-type-right {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				font-size: 24rpx;
+
+				.pay_type_item {
+					margin: 0 10rpx;
+					padding: 2rpx 20rpx;
+					border-radius: 30rpx;
+					border: solid 1rpx rgba($color: #000000, $alpha: 0);
+				}
+				.pay_type_item_select{
+					border: solid 1rpx #f7f7f7;
+				}
+			}
+		}
+
+		.record-title {
+			font-size: 28rpx;
+			color: #fff;
+			padding: 20rpx 0;
+		}
+
+		.record-money {
+			color: #fff;
+			font-size: 50rpx;
+			font-weight: bold;
+
+			span {
+				font-size: 30rpx;
+				font-weight: 400;
+				margin-right: 4rpx;
+			}
+		}
+	}
+
+	.record-list {
+		padding: 20rpx 30rpx;
+
+		.record-list-item {
+			padding: 20rpx 0;
+			border-bottom: solid 1rpx #f7f7f7;
+			.record-list-item-top {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				box-sizing: border-box;
+
+				.title {
+					font-size: 30rpx;
+					width: 500rpx;
+				}
+
+				.money {
+					color: #f40c50;
+					font-size: 34rpx;
+					font-weight: bold;
+				}
+			}
+
+			.record-list-item-date {
+				font-size: 24rpx;
+				color: #a6a6a6;
+				margin-top: 10rpx;
+			}
+		}
+	}
+</style>

pages/property/setting/setting.vue

@@ -0,0 +1,357 @@
+<template>
+	<view class="Mine">
+		<!-- 更多管理 -->
+		<view class="list">
+			<view class="list-item" @click="updImgs">
+				<view class="list-item-left">
+					<image src="/static/images/user-avatar.png" mode="widthFix" />
+					<span>修改头像</span>
+				</view>
+				<view class="avatar" >
+					<image :src="avatar.showPath" mode="aspectFill" />
+					<u-icon name="arrow-right" color="#f1f1f1" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-left">
+					<image src="/static/images/mine-self-name.png" mode="widthFix" />
+					<span>修改昵称</span>
+				</view>
+				<view class="input">
+					<input type="text" :value="nickname" @blur='blur' placeholder="请输入用户的昵称" maxlength="12" />
+					<u-icon name="arrow-right" color="#f1f1f1"  size="28"></u-icon>
+				</view>
+			</view>
+			<view @click="loginOut" class="list-item">
+				<view class="list-item-left">
+					<image src="/static/images/reset-info.png" mode="widthFix" />
+					<span>切换账户</span>
+				</view>
+				<u-icon name="arrow-right" color="#f1f1f1" size="28"></u-icon>
+			</view>
+		</view>
+		<!-- 底部banner -->
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+
+	</view>
+</template>
+
+<script>
+	import {
+		getUserSettingInfo,
+		resetUserInfo
+	} from '@/apis/interfaces/mine'
+	import {
+		uploads
+	} from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				canLogin: true,
+				nickname: '',
+				avatar: {
+					path: '',
+					showPath: ''
+				},
+				is_bind: true
+			}
+		},
+		onShow() {
+			wx.login({
+				success: res => {
+					this.loginCode = res.code
+				}
+			})
+			this.getUserInfo()
+		},
+		onPullDownRefresh() {
+			this.getUserInfo()
+		},
+		methods: {
+			// 获取当前用户得基本信息
+			getUserInfo() {
+				getUserSettingInfo().then(res => {
+					this.avatar.showPath = res.avatar
+					this.nickname = res.nickname
+					this.is_bind = res.is_bind
+					uni.stopPullDownRefresh()
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'primary',
+						duration: 3000
+					})
+				})
+			},
+			// 点击绑定用户得授权信息，且绑定带修改
+			getUser() {
+				uni.getUserProfile({
+					desc: "获取你的昵称、头像、地区及性别",
+					success: e => {
+						console.log(e)
+						if (e.errMsg == "getUserProfile:ok") {
+							this.userInfo = e.userInfo
+							//   // 检查用户登录Code是否过期
+							wx.checkSession({
+								success: res => {
+									this.userLogin(e)
+								},
+								fail: err => {
+									// 登录过期重新获取code
+									uni.login({
+										success: res => {
+											this.loginCode = res.code
+											// 登录
+											this.userLogin()
+										}
+									})
+								}
+							})
+						} else {
+							uni.showToast({
+								duration: 1500,
+								title: "绑定手机号失败了",
+								icon: 'none'
+							})
+						}
+					},
+					fail() {
+						uni.showToast({
+							duration: 1500,
+							title: "您拒绝了请求",
+							icon: 'none'
+						})
+					}
+				})
+			},
+			// 登陆接口
+			userLogin(info) {
+				let that = this
+				uni.login({
+					success: res => {
+						let data = {
+							iv: info.iv,
+							encryptedData: info.encryptedData,
+							code: res.code
+						}
+						uni.showLoading({
+							title: '绑定中'
+						})
+						wechatbind(data).then(res => {
+							setTimeout(res => {
+								uni.hideLoading()
+							}, 1000)
+							this.$refs.uToast.show({
+								title: '绑定成功',
+								type: 'primary',
+								duration: 3000
+							})
+							setTimeout(res => {
+								this.getUserInfo()
+							}, 3000)
+						}).catch(err => {
+							this.$refs.uToast.show({
+								title: err.message,
+								type: 'primary',
+								duration: 3000
+							})
+							uni.hideLoading()
+						})
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+
+			},
+			loginOut() {
+				uni.removeStorageSync('token')
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+			},
+			// 上传头像
+			updImgs(type) {
+				uni.chooseImage({
+					success: res => {
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri: val.path
+							}
+						})
+						uploads(path).then(pathRes => {
+							console.log(pathRes)
+							this.avatar.path = pathRes.path[0]
+							this.avatar.showPath = pathRes.url[0]
+							this.resetUserInfo('avatar',pathRes.url[0])
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon: 'none'
+							})
+						})
+					}
+				})
+			},
+			// 修改姓名
+			blur(e){
+				let value = e.detail.value
+				console.log(value)
+				console.log(this.nickname)
+				if(value !== this.nickname){
+					this.resetUserInfo('nickname',value)
+				}
+			},
+			// 修改头像或昵称
+			resetUserInfo(key, value) {
+				let data ={
+					key:key,
+					value:value
+				}
+				resetUserInfo(data).then(res=>{
+					uni.showToast({
+						title: res,
+						icon: 'none'
+					})
+					this.getUserInfo()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.Mine {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		background-color: #fff;
+
+		// 更多管理
+		.list {
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			position: relative;
+			top: -10rpx;
+			border-radius: 20rpx;
+			margin: 0 40rpx;
+			padding: 30rpx 0;
+			width: calc(100% - 80rpx);
+
+			button::after {
+				border: none;
+				background-color: none;
+			}
+
+			button {
+				position: relative;
+				display: block;
+				margin-left: auto;
+				margin-right: auto;
+				padding-left: 0;
+				padding-right: 0;
+				box-sizing: border-box;
+				font-size: $title-size *0.9;
+				text-align: center;
+				text-decoration: none;
+				line-height: 1;
+				border-radius: 5px;
+				-webkit-tap-highlight-color: transparent;
+				overflow: hidden;
+				color: #333;
+				background-color: #fff;
+			}
+
+			.list-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 40rpx 0;
+				border-bottom: solid 1rpx #f7f7f7;
+				box-sizing: border-box;
+
+				.avatar {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+
+					image {
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+				}
+
+				.input {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					text-align: right;
+					flex: 1;
+
+					input {
+						padding-right: 30rpx;
+						width: 100%;
+					}
+				}
+
+				.list-item-left {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+					}
+
+					span {
+						margin-left: 20rpx;
+					}
+				}
+			}
+		}
+
+		// 底部轮播图跳转到其他app
+		.mine-banner {
+			position: relative;
+			width: calc(100% - 80rpx);
+			top: -20rpx;
+			margin: 0 40rpx;
+			box-sizing: border-box;
+			margin-top: $margin*2;
+		}
+	}
+
+	.loginOut {
+		margin: 30rpx 50rpx;
+		background-color: #fff;
+		box-shadow: 0 0 20rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+		text-align: center;
+		padding: 20rpx;
+		border-radius: 10rpx;
+		color: #353535;
+	}
+</style>

pages/property/token.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		数权账户
+		权证账户
 	</view>
 </template>
 

pages/verification/index.vue

@@ -1,6 +1,12 @@
 <template>
-	<view>
+	<view class="Verification">
-		优惠券核销
+		
+		<image  src="/static/images/hexiao_bg.png" mode="widthFix" />
+		
+		<view class="">
+			<view class="">扫描券码和权证 一键核销</view>
+			<view class="">降低核销门槛  低成本留存优质客户</view>
+		</view>
 	</view>
 </template>
 
@@ -15,5 +21,14 @@
 </script>
 
 <style lang="scss">
-
+.Verification{
+	width: 100%;
+	height: 100vh;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+}
 </style>

unpackage/dist/dev/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/dist/dev/app-plus/app-config.js

@@ -1,154 +0,0 @@
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// install a JSONP callback for chunk loading
-/******/ 	function webpackJsonpCallback(data) {
-/******/ 		var chunkIds = data[0];
-/******/ 		var moreModules = data[1];
-/******/ 		var executeModules = data[2];
-/******/
-/******/ 		// add "moreModules" to the modules object,
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
-/******/ 		for(;i < chunkIds.length; i++) {
-/******/ 			chunkId = chunkIds[i];
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
-/******/ 				resolves.push(installedChunks[chunkId][0]);
-/******/ 			}
-/******/ 			installedChunks[chunkId] = 0;
-/******/ 		}
-/******/ 		for(moduleId in moreModules) {
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
-/******/ 				modules[moduleId] = moreModules[moduleId];
-/******/ 			}
-/******/ 		}
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
-/******/
-/******/ 		while(resolves.length) {
-/******/ 			resolves.shift()();
-/******/ 		}
-/******/
-/******/ 		// add entry modules from loaded chunk to deferred list
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
-/******/
-/******/ 		// run deferred modules when all chunks ready
-/******/ 		return checkDeferredModules();
-/******/ 	};
-/******/ 	function checkDeferredModules() {
-/******/ 		var result;
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
-/******/ 			var deferredModule = deferredModules[i];
-/******/ 			var fulfilled = true;
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
-/******/ 				var depId = deferredModule[j];
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
-/******/ 			}
-/******/ 			if(fulfilled) {
-/******/ 				deferredModules.splice(i--, 1);
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
-/******/ 			}
-/******/ 		}
-/******/
-/******/ 		return result;
-/******/ 	}
-/******/
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// object to store loaded and loading chunks
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
-/******/ 	var installedChunks = {
-/******/ 		"app-config": 0
-/******/ 	};
-/******/
-/******/ 	var deferredModules = [];
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/ 	var jsonpArray = this["webpackJsonp"] = this["webpackJsonp"] || [];
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
-/******/ 	jsonpArray.push = webpackJsonpCallback;
-/******/ 	jsonpArray = jsonpArray.slice();
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
-/******/
-/******/
-/******/ 	// run deferred modules from other chunks
-/******/ 	checkDeferredModules();
-/******/ })
-/************************************************************************/
-/******/ ([]);

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/market/details\",\"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":"{\"id\":1,\"name\":\"pages/market/details\",\"pathName\":\"pages/market/details\",\"query\":\"\"}","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"}}