wenjie 1 год назад
Родитель
Сommit
888685edf1
90 измененных файлов с 356 добавлено и 380 удалено
  1. 7 0
      api/goods.js
  2. 11 17
      components/zs-banner/index.vue
  3. 18 28
      detail/virtualGoods/index.vue
  4. 2 7
      pages/index/index.vue
  5. 1 1
      study/test.vue
  6. 0 0
      unpackage/dist/build/mp-weixin/common/runtime.js
  7. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  8. 0 0
      unpackage/dist/build/mp-weixin/components/zs-banner/index.js
  9. 1 1
      unpackage/dist/build/mp-weixin/components/zs-banner/index.wxml
  10. 1 1
      unpackage/dist/build/mp-weixin/components/zs-banner/index.wxss
  11. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.js
  12. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxml
  13. 0 0
      unpackage/dist/build/mp-weixin/pages/index/index.wxss
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/city-select/city-select.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-banner/index.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-img/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-list/index.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-load-more/index.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-search/index.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-skeleton/index.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/detail/discountsDetail/index.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/detail/qrcode/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/detail/shopDetail/shopDetail.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/integral/logs.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/integral/shop.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/integral/store.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/login/login/login.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/login/login/otherLogin.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/coupon/index.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/edit/edit.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/edit/editName.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/favorite/index.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/order/detail.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/my/order/index.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/chatRoom.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/index.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/study/index.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/cc-dropDownMenu/components/cc-dropDownMenu/cc-dropDownMenu.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-column-notice/u-column-notice.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-grid-item/u-grid-item.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-grid/u-grid.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-image/u-image.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-row-notice/u-row-notice.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
  68. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  69. 157 144
      unpackage/dist/dev/mp-weixin/common/vendor.js
  70. 4 9
      unpackage/dist/dev/mp-weixin/components/zs-banner/index.js
  71. 1 1
      unpackage/dist/dev/mp-weixin/components/zs-banner/index.wxml
  72. 0 4
      unpackage/dist/dev/mp-weixin/components/zs-banner/index.wxss
  73. 3 3
      unpackage/dist/dev/mp-weixin/login/login/login.js
  74. 3 3
      unpackage/dist/dev/mp-weixin/login/login/otherLogin.js
  75. 1 1
      unpackage/dist/dev/mp-weixin/my/order/detail.js
  76. 0 1
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  77. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  78. 0 5
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  79. 1 16
      unpackage/dist/dev/mp-weixin/project.config.json
  80. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js
  81. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js
  82. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js
  83. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js
  84. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js
  85. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  86. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js
  87. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js
  88. 1 1
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js
  89. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json
  90. 78 71
      utils/request.js

+ 7 - 0
api/goods.js

@@ -49,3 +49,10 @@ export function getVirtuallist(data) {
 	})
 }
 
+// 获取虚拟商品信息
+export function getVirtualInfo(data) {
+	return request({
+		url: '/zswl-cloud-shop/yqd/info',
+		data
+	})
+}

+ 11 - 17
components/zs-banner/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="zs-banner">
 		<!-- <view class="position-box" :style="{height:navBareight +'px',top:statusBarHeight+'px'}" v-if="position"> -->
-		<view class="position-box" :style="{height:statusBarHeight+navBareight +'px',background:background?'#fff':''}" v-if="position">
+		<view class="position-box" :style="{height:navBareight +'px',background:background?'#fff':''}" v-if="position">
 			<view class="position">
 				<image class="position-icon" src="../../static/black-position.png" mode=""></image>
 				<text class="city">{{city}}</text>
 			</view>
 			<view class="search-box" @click="handleSearch">
-				<input class="search" type="text" placeholder="搜索" v-model="search" />
+				<input class="search"  :style="{height:height+'px'}" type="text" placeholder="搜索" v-model="search" />
 				<image class="icon" src="../../static/search.png" mode=""></image>
 			</view>
 		</view>
@@ -52,8 +52,8 @@
 		},
 		data() {
 			return {
-				statusBarHeight:0,
 				navBareight:0,
+				height:0,
 				search:'',
 				theme: '#FD9E59', //顶部颜色
 				textList: [], //通知列表
@@ -121,22 +121,16 @@
 				this.$emit('search',this.search)
 			},
 			getNavHeight(){
-				
-				//获取手机系统信息 -- 状态栏高度
-				let {
-					statusBarHeight,
-				} = uni.getSystemInfoSync()
-				this.statusBarHeight = statusBarHeight
+		
 				//去除
 				//#ifndef H5 || MP-ALIPAY ||APP-PLUS
 				//获取小程序胶囊的高度
 				let {
-					top,
 					bottom,
-					left
+					height
 				} = uni.getMenuButtonBoundingClientRect()
-				//高度 =(胶囊底部高低-状态栏高度)+(胶囊顶部高度-状态栏内的高度)
-				this.navBareight = (bottom - statusBarHeight) + (top - statusBarHeight)
+				this.height = height
+				this.navBareight = bottom
 				//#endif
 			}
 		},
@@ -168,7 +162,7 @@
 		align-items: flex-end;
 		justify-content: center;
 		box-sizing: border-box;
-		padding-bottom: 6rpx;
+		// padding-bottom: 6rpx;
 		.position{
 			position: absolute;
 			// top: 50%;
@@ -189,7 +183,7 @@
 		}
 		.search-box {
 			width: 380rpx;
-			height: 60rpx;
+			// height: 60rpx;
 			background: #FFFFFF;
 			border-radius: 30rpx;
 			position: absolute;
@@ -205,8 +199,8 @@
 			}
 			
 			.search {
-				line-height: 60rpx;
-				height: 60rpx;
+				// line-height: 60rpx;
+				// height: 60rpx;
 				padding-left: 80rpx;
 			}
 		}

+ 18 - 28
detail/virtualGoods/index.vue

@@ -1,25 +1,6 @@
 <template>
 	<view class="virtual">
 		
-		<!-- 初版排版 -->
-	<!-- 	<view class="goods-template" v-for="(item,index) in goodsData" :key="index">
-			<view class="title-box">
-				<view class="icon"></view>
-				<view class="title">
-					{{item.catalogName}}
-				</view>
-			</view>
-			
-			<u-grid :border="false" col="3" class="box">
-				<u-grid-item v-for="i in item.goodsInfos" :key="i.goodsId">
-					<view class="item" :class="[active == i.goodsId?'active':'']" @click="handleItem(i,item.catalogName)">
-						<view class="item-title">{{i.name}}</view>
-						<view class="price">¥{{i.price}}</view>
-					</view>
-				</u-grid-item>
-			</u-grid>
-		</view> -->
-		
 		<view class="box" v-for="(item,index) in goodsData" :key="index">
 			<view class="goods-item" v-for="i in item.goodsInfos" :key="i.goodsId" @click="handleItem(i,item.catalogName)">
 				<image class="icon" :src="i.mainImg" mode=""></image>
@@ -51,7 +32,10 @@
 						</view>
 					</view>
 					<view class="price">
-						¥{{chooseInfo.price}}
+						<u-loading-icon v-if="loadingPrice" text="获取价格中"></u-loading-icon>
+						<template v-else>
+							¥{{chooseInfo.price}}
+						</template>
 					</view>
 				</view>
 				
@@ -73,16 +57,16 @@
 </template>
 
 <script>
-	import {getVirtuallist} from '@/api/goods.js'
+	import {getVirtuallist,getVirtualInfo} from '@/api/goods.js'
 	import {SHOP_ID} from '@/utils/config.js'
 	export default {
 		data() {
 			return {
-				active:0,
 				show: false,
 				goodsData:[],
 				chooseInfo:null,
 				loading:false,
+				loadingPrice:false,
 				form:{
 					account:''
 				},
@@ -90,10 +74,10 @@
 		},
 		methods: {
 			handleItem(item,catalogName) {
-				this.active = item.goodsId
-				this.chooseInfo = item
+				this.chooseInfo = JSON.parse(JSON.stringify(item) ) 
 				this.chooseInfo.catalogName = catalogName
 				this.show = true
+				this.getVirtualInfo(item.mainId)
 			},
 			 open() {
 			},
@@ -107,6 +91,15 @@
 					}
 				})
 			},
+			getVirtualInfo(commodityId){
+				this.loadingPrice = true
+				getVirtualInfo({commodityId}).then(res=>{
+					this.loadingPrice = false
+					if(res.state == 'Success'){
+						this.chooseInfo.price = res.content.realPrice
+					}
+				})
+			},
 			// 创建订单
 			handleBuy() {
 				if (uni.getStorageSync('token')) {
@@ -179,10 +172,7 @@
 			}
 		}
 		.u-grid{
-			.item.active{
-				background: rgba(252,247,235,0.39);
-				border: 2rpx solid #F5D07E;
-			}
+			
 			.item{
 				width: 218rpx;
 				height: 218rpx;

+ 2 - 7
pages/index/index.vue

@@ -25,7 +25,7 @@
 				</view>
 				<swiper class="swiper" @change="swiperChange" :current="current" :indicator-dots="false" circular :autoplay="true"
 					:interval="3000" :duration="1000">
-					<swiper-item v-for="(item,index) in advList" :key="item.id">
+					<swiper-item v-for="(item,index) in advList" :key="item.id"  @click="jump(item.jumpUrl)">
 						<image class="swiper-item" mode="" :src="item.advertsImg">
 						</image>
 					</swiper-item>
@@ -74,7 +74,6 @@
 						</view>
 					</view>
 					<view class="right">
-						<image class="video-vip" @click="jump('/detail/virtualGoods/index')" src="http://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/FOGWH3t0SXX92f0f0ab9d17f5d025508119da6f8ee9e.png/1.png" mode=""></image>
 						<view class="store-item" v-for="(item,index) in list1" :key="index" @click="goShopDetail(item)">
 							<zs-img :src="item.logoPath" width="340rpx" height="340rpx" mode="widthFix"></zs-img>
 							<view class="info">
@@ -470,11 +469,7 @@
 				}
 
 				.right {
-					.video-vip {
-						width: 340rpx;
-						height: 244rpx;
-						border-radius: 16rpx;
-					}
+
 				}
 
 				.store-item {

+ 1 - 1
study/test.vue

@@ -38,7 +38,7 @@
 		<view class="btn-group">
 			<template v-if="isOver">
 				<view class="btn" @click="jump">
-					开启研学之旅
+					个性化研学路线推荐
 				</view>
 				<view class="btn pre-btn" @click="handleAgain">
 					再测一次

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/common/runtime.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/components/zs-banner/index.js


+ 1 - 1
unpackage/dist/build/mp-weixin/components/zs-banner/index.wxml

@@ -1 +1 @@
-<view class="zs-banner"><block wx:if="{{position}}"><view class="position-box" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background?'#fff':'')+';')}}"><view class="position"><image class="position-icon" src="../../static/black-position.png" mode></image><text class="city">{{city}}</text></view><view data-event-opts="{{[['tap',[['handleSearch',['$event']]]]]}}" class="search-box" bindtap="__e"><input class="search" type="text" placeholder="搜索" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]]]]]}}" value="{{search}}" bindinput="__e"/><image class="icon" src="../../static/search.png" mode></image></view></view></block><view class="top-box" style="{{'--bg:'+(theme)+';'}}"><swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" duration="{{1000}}" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item><image class="swiper-item" mode src="{{item.bannerImg}}"></image></swiper-item></block></swiper></view><u-notice-bar vue-id="f89668a4-1" bgColor="none" icon="volume-fill" color="#6F4F23" direction="column" fontSize="{{26}}" text="{{textList}}" bind:__l="__l"></u-notice-bar></view>
+<view class="zs-banner"><block wx:if="{{position}}"><view class="position-box" style="{{'height:'+(navBareight+'px')+';'+('background:'+(background?'#fff':'')+';')}}"><view class="position"><image class="position-icon" src="../../static/black-position.png" mode></image><text class="city">{{city}}</text></view><view data-event-opts="{{[['tap',[['handleSearch',['$event']]]]]}}" class="search-box" bindtap="__e"><input class="search" style="{{'height:'+(height+'px')+';'}}" type="text" placeholder="搜索" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]]]]]}}" value="{{search}}" bindinput="__e"/><image class="icon" src="../../static/search.png" mode></image></view></view></block><view class="top-box" style="{{'--bg:'+(theme)+';'}}"><swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" duration="{{1000}}" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item><image class="swiper-item" mode src="{{item.bannerImg}}"></image></swiper-item></block></swiper></view><u-notice-bar vue-id="f89668a4-1" bgColor="none" icon="volume-fill" color="#6F4F23" direction="column" fontSize="{{26}}" text="{{textList}}" bind:__l="__l"></u-notice-bar></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/components/zs-banner/index.wxss

@@ -1 +1 @@
-.zs-banner  .u-notice .u-icon__icon{font-size:32rpx!important}.zs-banner{position:relative;height:584rpx}.zs-banner .position-box{position:fixed;width:100%;top:0;left:0;z-index:2;display:flex;align-items:flex-end;justify-content:center;box-sizing:border-box;padding-bottom:6rpx}.zs-banner .position-box .position{position:absolute;left:30rpx;color:#222;display:flex;align-items:center;font-size:24rpx}.zs-banner .position-box .position .position-icon{width:40rpx;height:40rpx}.zs-banner .position-box .position .city{margin-left:6rpx;line-height:60rpx}.zs-banner .position-box .search-box{width:380rpx;height:60rpx;background:#fff;border-radius:30rpx;position:absolute;left:160rpx;box-shadow:0rpx 0rpx 20rpx 2rpx rgba(0,0,0,.1)}.zs-banner .position-box .search-box .icon{width:34rpx;height:34rpx;position:absolute;top:50%;left:22rpx;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.zs-banner .position-box .search-box .search{line-height:60rpx;height:60rpx;padding-left:80rpx}.zs-banner .top-box{background:linear-gradient(180deg,var(--bg),#fff);height:536rpx;box-sizing:border-box;display:flex;flex-direction:column;justify-content:flex-end}.zs-banner .top-box .swiper{height:584rpx;border-radius:16rpx}.zs-banner .top-box .swiper .swiper-item{width:100%;height:100%;object-fit:cover}
+.zs-banner  .u-notice .u-icon__icon{font-size:32rpx!important}.zs-banner{position:relative;height:584rpx}.zs-banner .position-box{position:fixed;width:100%;top:0;left:0;z-index:2;display:flex;align-items:flex-end;justify-content:center;box-sizing:border-box}.zs-banner .position-box .position{position:absolute;left:30rpx;color:#222;display:flex;align-items:center;font-size:24rpx}.zs-banner .position-box .position .position-icon{width:40rpx;height:40rpx}.zs-banner .position-box .position .city{margin-left:6rpx;line-height:60rpx}.zs-banner .position-box .search-box{width:380rpx;background:#fff;border-radius:30rpx;position:absolute;left:160rpx;box-shadow:0rpx 0rpx 20rpx 2rpx rgba(0,0,0,.1)}.zs-banner .position-box .search-box .icon{width:34rpx;height:34rpx;position:absolute;top:50%;left:22rpx;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.zs-banner .position-box .search-box .search{padding-left:80rpx}.zs-banner .top-box{background:linear-gradient(180deg,var(--bg),#fff);height:536rpx;box-sizing:border-box;display:flex;flex-direction:column;justify-content:flex-end}.zs-banner .top-box .swiper{height:584rpx;border-radius:16rpx}.zs-banner .top-box .swiper .swiper-item{width:100%;height:100%;object-fit:cover}

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/index.wxss


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/city-select/city-select.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-banner/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-img/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-list/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-load-more/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-search/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/zs-skeleton/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/detail/discountsDetail/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/detail/qrcode/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/detail/shopDetail/shopDetail.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/integral/logs.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/integral/shop.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/integral/store.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/login/login/login.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/login/login/otherLogin.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/coupon/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/edit/edit.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/edit/editName.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/favorite/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/order/detail.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/my/order/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/chatRoom.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/study/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/cc-dropDownMenu/components/cc-dropDownMenu/cc-dropDownMenu.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell-group/u-cell-group.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-cell/u-cell.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-column-notice/u-column-notice.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-grid-item/u-grid-item.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-grid/u-grid.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-image/u-image.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-row-notice/u-row-notice.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


+ 157 - 144
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9786,11 +9786,10 @@ var request = function request(options) {
 
           // token过期或出了问题
           if (res.data.exception && res.data.exception.type == 'AuthenticationCredentialsNotFoundException') {
+            uni.showLoading({
+              title: '刷新登录中'
+            });
             if (!uni.getStorageSync('refreshToken')) {
-              uni.showToast({
-                title: '登录失效',
-                icon: 'fail'
-              });
               uni.clearStorageSync();
               uni.reLaunch({
                 url: '/pages/index/index'
@@ -9804,6 +9803,7 @@ var request = function request(options) {
                 refreshToken: uni.getStorageSync('refreshToken')
               },
               success: function success(r) {
+                uni.hideLoading();
                 if (r.data.content == '刷新令牌错误') {
                   uni.showToast({
                     title: '登录失效',
@@ -9816,11 +9816,15 @@ var request = function request(options) {
                 } else {
                   uni.setStorageSync('token', r.data.content); //登录状态
                   // 刷新页面
+                  var list = ['/pay/pay'];
                   var pages = getCurrentPages();
                   var url = '/' + pages[pages.length - 1].route;
-                  uni.reLaunch({
-                    url: url
-                  });
+                  if (list.indexOf(url) == -1) {
+                    console.log(11111111, list.indexOf(url), url);
+                    uni.reLaunch({
+                      url: url
+                    });
+                  }
                 }
               }
             });
@@ -20711,6 +20715,7 @@ exports.allCouponByUser = allCouponByUser;
 exports.creat = creat;
 exports.getCouponList = getCouponList;
 exports.getCouponType = getCouponType;
+exports.getVirtualInfo = getVirtualInfo;
 exports.getVirtuallist = getVirtuallist;
 exports.getWhetherCoupon = getWhetherCoupon;
 var _request = __webpack_require__(/*! @/utils/request.js */ 31);
@@ -20763,6 +20768,14 @@ function getVirtuallist(data) {
   });
 }
 
+// 获取虚拟商品信息
+function getVirtualInfo(data) {
+  return (0, _request.request)({
+    url: '/zswl-cloud-shop/yqd/info',
+    data: data
+  });
+}
+
 /***/ }),
 /* 250 */
 /*!*************************************************!*\
@@ -31769,6 +31782,90 @@ exports.default = _default;
 /* 723 */,
 /* 724 */,
 /* 725 */
+/*!*******************************************************************************************!*\
+  !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
+  \*******************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 是否显示组件
+    show: {
+      type: Boolean,
+      default: uni.$u.props.loadingIcon.show
+    },
+    // 颜色
+    color: {
+      type: String,
+      default: uni.$u.props.loadingIcon.color
+    },
+    // 提示文字颜色
+    textColor: {
+      type: String,
+      default: uni.$u.props.loadingIcon.textColor
+    },
+    // 文字和图标是否垂直排列
+    vertical: {
+      type: Boolean,
+      default: uni.$u.props.loadingIcon.vertical
+    },
+    // 模式选择,circle-圆形,spinner-花朵形,semicircle-半圆形
+    mode: {
+      type: String,
+      default: uni.$u.props.loadingIcon.mode
+    },
+    // 图标大小,单位默认px
+    size: {
+      type: [String, Number],
+      default: uni.$u.props.loadingIcon.size
+    },
+    // 文字大小
+    textSize: {
+      type: [String, Number],
+      default: uni.$u.props.loadingIcon.textSize
+    },
+    // 文字内容
+    text: {
+      type: [String, Number],
+      default: uni.$u.props.loadingIcon.text
+    },
+    // 动画模式
+    timingFunction: {
+      type: String,
+      default: uni.$u.props.loadingIcon.timingFunction
+    },
+    // 动画执行周期时间
+    duration: {
+      type: [String, Number],
+      default: uni.$u.props.loadingIcon.duration
+    },
+    // mode=circle时的暗边颜色
+    inactiveColor: {
+      type: String,
+      default: uni.$u.props.loadingIcon.inactiveColor
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 726 */,
+/* 727 */,
+/* 728 */,
+/* 729 */,
+/* 730 */,
+/* 731 */,
+/* 732 */,
+/* 733 */
 /*!***********************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-form/props.js ***!
   \***********************************************************************************/
@@ -31831,12 +31928,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 726 */,
-/* 727 */,
-/* 728 */,
-/* 729 */,
-/* 730 */,
-/* 731 */
+/* 734 */,
+/* 735 */,
+/* 736 */,
+/* 737 */,
+/* 738 */,
+/* 739 */
 /*!****************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-form-item/props.js ***!
   \****************************************************************************************/
@@ -31902,14 +31999,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 732 */,
-/* 733 */,
-/* 734 */,
-/* 735 */,
-/* 736 */,
-/* 737 */,
-/* 738 */,
-/* 739 */
+/* 740 */,
+/* 741 */,
+/* 742 */,
+/* 743 */,
+/* 744 */,
+/* 745 */,
+/* 746 */,
+/* 747 */
 /*!************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-input/props.js ***!
   \************************************************************************************/
@@ -32114,12 +32211,12 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 740 */,
-/* 741 */,
-/* 742 */,
-/* 743 */,
-/* 744 */,
-/* 745 */
+/* 748 */,
+/* 749 */,
+/* 750 */,
+/* 751 */,
+/* 752 */,
+/* 753 */
 /*!**************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-overlay/props.js ***!
   \**************************************************************************************/
@@ -32161,14 +32258,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 746 */,
-/* 747 */,
-/* 748 */,
-/* 749 */,
-/* 750 */,
-/* 751 */,
-/* 752 */,
-/* 753 */
+/* 754 */,
+/* 755 */,
+/* 756 */,
+/* 757 */,
+/* 758 */,
+/* 759 */,
+/* 760 */,
+/* 761 */
 /*!*******************************************************!*\
   !*** F:/项目/HBuilderProjects/test/static/back-btn.png ***!
   \*******************************************************/
@@ -32178,7 +32275,7 @@ exports.default = _default;
 module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAh1BMVEUAAAAhISEAAAAhISEhISEfHx8cHBwhISEhISEhISEhISEfHx8eHh4bGxshISEhISEhISEhISEhISEhISEgICAgICAgICAgICAfHx8eHh4gICAiIiIhISEhISEhISEhISEhISEhISEhISEgICAgICAdHR0dHR0bGxsgICAgICAhISEhISEiIiJFDlwJAAAALHRSTlMA8QX79y8N7Nq+uUQ6CejTxbOropyQbVtMKSTjzMiXfnRkPjYfGhUSh4ZVVAScx9wAAADhSURBVDjLjdTXDsIwDIXh0FK6gTJKyx4djLz/84HsXvQG/Tl3kT5FjmzH/E8d2XhmOEForT2ze0zsLyd0d3H2Qi6dituQq8RxhR9f3JbcTt2T3M26vaNUdyV3VVeSe6m7kdsK83fkNo5ure4NzFuJm1bkCnUpuDwZOa5vcjcUnb/MYJYCVx7CQK8sHGQoMslZzkU6rGitcslyfxB57FE2kchFh7IdZIuyW4iMGpT9UeRhj3J2EjmvWWo3wwBlHqt8sEx05jKUXqEyZTnsT8ZSJz7RE+94jEx/Db8yLsnKUXu+N3Yo6wU5V6sAAAAASUVORK5CYII="
 
 /***/ }),
-/* 754 */
+/* 762 */
 /*!*************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/static/back-btn-white.png ***!
   \*************************************************************/
@@ -32188,14 +32285,14 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7
 module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAvxJREFUWEfN2FuozFEUx/Hvz52IIkXKC0IUSSgpt4NcSocXl5SoU4pS58GDlCQpoaSEwoOURHI/HFEU5YEHLzx4kBKR5JLbMquW0rSZ+c/sMdbbNNP//2n2XnuvtcQ/CjMbC5wFRgE3gaWS3lV6vSr9IMf3ZjYRuAYM+u15hyS1VXp+w4FmNgW4Agwow9yTNLWpQDObAVwA+iUg2yVtaxrQzOYC54A+CcRRYH0JaE0BmtlC4AzQMwE4KGlDJdiv77PvQTNbVsrUk0D3BGKvpM3V4vx3WYFmthI4DnRNIHZJ2lIElxVoZuuAQ0CXBGKrpB1FcdmAZraxdIzsS6yIJ0G7pD214LIAzay9lKm7EwDHbZR0oFZc3UAz2wmk9tUPoE3S4XpwdQHNzJd0UwLwHVgr6US9uJqAZuaZ78mw/g+4VZJO5cAVBpqZZ+gxYHUC8BVYKel0LlwhoJl1iwN4eQLwBVgu6XxOXNXAUjL0iKtrUQLwOWo7r1iyR8WbxMx6R6E5L/H2j8ASSTeyy+KB1QB9z61JAN4DiyTdbhSuqiU2M4f0TSCmS7rTSFy1wLvAtATEs3WFpG+NRFazxBOiySkv2d3l1XKrJM/ihkRFoL81mp4OYGBCcTWy+FMjhFUBAzkeuA4MTkBuAQslfciNrBoYyDGAHylDEhDfq/MleVJli0LAQI4EOoFhCcUDoEXSm1zCwsBADo/lHpGAPALmlBqjVzmQNQEDOTSWe3QC8hiYK+lFvciagYH0hPE9OS4BeRrIZ/Ug6wIG0o8eP2omJSDPgVmSntSKrBsYyP6B9DlMebwMpC974cgCDKTf15dLyTM9oXgdifOwqDAbMJA+h/Hrb2YC8jbOyftFkFmBgewVQ6NU/eiH+IIiVVB2YCD/VoH7dbhYkk9ZK0ZDgIH0Hsa7u9aEwtuE2ZL8evxrNAwYSB8i+TDJh0rl0VECtjQVGEj/E454M1+G6ZQ0u+nAXwAz2++zmvjsPbRP+S/+N8D4N711mAxckuRXYcX4CWyz5Sldqp5tAAAAAElFTkSuQmCC"
 
 /***/ }),
-/* 755 */,
-/* 756 */,
-/* 757 */,
-/* 758 */,
-/* 759 */,
-/* 760 */,
-/* 761 */,
-/* 762 */
+/* 763 */,
+/* 764 */,
+/* 765 */,
+/* 766 */,
+/* 767 */,
+/* 768 */,
+/* 769 */,
+/* 770 */
 /*!***********************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-grid/props.js ***!
   \***********************************************************************************/
@@ -32232,14 +32329,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 763 */,
-/* 764 */,
-/* 765 */,
-/* 766 */,
-/* 767 */,
-/* 768 */,
-/* 769 */,
-/* 770 */
+/* 771 */,
+/* 772 */,
+/* 773 */,
+/* 774 */,
+/* 775 */,
+/* 776 */,
+/* 777 */,
+/* 778 */
 /*!****************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-grid-item/props.js ***!
   \****************************************************************************************/
@@ -32271,14 +32368,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 771 */,
-/* 772 */,
-/* 773 */,
-/* 774 */,
-/* 775 */,
-/* 776 */,
-/* 777 */,
-/* 778 */
+/* 779 */,
+/* 780 */,
+/* 781 */,
+/* 782 */,
+/* 783 */,
+/* 784 */,
+/* 785 */,
+/* 786 */
 /*!************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-image/props.js ***!
   \************************************************************************************/
@@ -32380,90 +32477,6 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 779 */,
-/* 780 */,
-/* 781 */,
-/* 782 */,
-/* 783 */,
-/* 784 */
-/*!*******************************************************************************************!*\
-  !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
-  \*******************************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  props: {
-    // 是否显示组件
-    show: {
-      type: Boolean,
-      default: uni.$u.props.loadingIcon.show
-    },
-    // 颜色
-    color: {
-      type: String,
-      default: uni.$u.props.loadingIcon.color
-    },
-    // 提示文字颜色
-    textColor: {
-      type: String,
-      default: uni.$u.props.loadingIcon.textColor
-    },
-    // 文字和图标是否垂直排列
-    vertical: {
-      type: Boolean,
-      default: uni.$u.props.loadingIcon.vertical
-    },
-    // 模式选择,circle-圆形,spinner-花朵形,semicircle-半圆形
-    mode: {
-      type: String,
-      default: uni.$u.props.loadingIcon.mode
-    },
-    // 图标大小,单位默认px
-    size: {
-      type: [String, Number],
-      default: uni.$u.props.loadingIcon.size
-    },
-    // 文字大小
-    textSize: {
-      type: [String, Number],
-      default: uni.$u.props.loadingIcon.textSize
-    },
-    // 文字内容
-    text: {
-      type: [String, Number],
-      default: uni.$u.props.loadingIcon.text
-    },
-    // 动画模式
-    timingFunction: {
-      type: String,
-      default: uni.$u.props.loadingIcon.timingFunction
-    },
-    // 动画执行周期时间
-    duration: {
-      type: [String, Number],
-      default: uni.$u.props.loadingIcon.duration
-    },
-    // mode=circle时的暗边颜色
-    inactiveColor: {
-      type: String,
-      default: uni.$u.props.loadingIcon.inactiveColor
-    }
-  }
-};
-exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
-
-/***/ }),
-/* 785 */,
-/* 786 */,
 /* 787 */,
 /* 788 */,
 /* 789 */,

+ 4 - 9
unpackage/dist/dev/mp-weixin/components/zs-banner/index.js

@@ -192,8 +192,8 @@ var _default = {
   },
   data: function data() {
     return {
-      statusBarHeight: 0,
       navBareight: 0,
+      height: 0,
       search: '',
       theme: '#FD9E59',
       //顶部颜色
@@ -267,19 +267,14 @@ var _default = {
       this.$emit('search', this.search);
     },
     getNavHeight: function getNavHeight() {
-      //获取手机系统信息 -- 状态栏高度
-      var _uni$getSystemInfoSyn = uni.getSystemInfoSync(),
-        statusBarHeight = _uni$getSystemInfoSyn.statusBarHeight;
-      this.statusBarHeight = statusBarHeight;
       //去除
 
       //获取小程序胶囊的高度
       var _uni$getMenuButtonBou = uni.getMenuButtonBoundingClientRect(),
-        top = _uni$getMenuButtonBou.top,
         bottom = _uni$getMenuButtonBou.bottom,
-        left = _uni$getMenuButtonBou.left;
-      //高度 =(胶囊底部高低-状态栏高度)+(胶囊顶部高度-状态栏内的高度)
-      this.navBareight = bottom - statusBarHeight + (top - statusBarHeight);
+        height = _uni$getMenuButtonBou.height;
+      this.height = height;
+      this.navBareight = bottom;
     }
   },
   created: function created() {

+ 1 - 1
unpackage/dist/dev/mp-weixin/components/zs-banner/index.wxml

@@ -1 +1 @@
-<view class="zs-banner"><block wx:if="{{position}}"><view class="position-box" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background?'#fff':'')+';')}}"><view class="position"><image class="position-icon" src="../../static/black-position.png" mode></image><text class="city">{{city}}</text></view><view data-event-opts="{{[['tap',[['handleSearch',['$event']]]]]}}" class="search-box" bindtap="__e"><input class="search" type="text" placeholder="搜索" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]]]]]}}" value="{{search}}" bindinput="__e"/><image class="icon" src="../../static/search.png" mode></image></view></view></block><view class="top-box" style="{{'--bg:'+(theme)+';'}}"><swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" duration="{{1000}}" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item><image class="swiper-item" mode src="{{item.bannerImg}}"></image></swiper-item></block></swiper></view><u-notice-bar vue-id="f89668a4-1" bgColor="none" icon="volume-fill" color="#6F4F23" direction="column" fontSize="{{26}}" text="{{textList}}" bind:__l="__l"></u-notice-bar></view>
+<view class="zs-banner"><block wx:if="{{position}}"><view class="position-box" style="{{'height:'+(navBareight+'px')+';'+('background:'+(background?'#fff':'')+';')}}"><view class="position"><image class="position-icon" src="../../static/black-position.png" mode></image><text class="city">{{city}}</text></view><view data-event-opts="{{[['tap',[['handleSearch',['$event']]]]]}}" class="search-box" bindtap="__e"><input class="search" style="{{'height:'+(height+'px')+';'}}" type="text" placeholder="搜索" data-event-opts="{{[['input',[['__set_model',['','search','$event',[]]]]]]}}" value="{{search}}" bindinput="__e"/><image class="icon" src="../../static/search.png" mode></image></view></view></block><view class="top-box" style="{{'--bg:'+(theme)+';'}}"><swiper class="swiper" indicator-dots="{{true}}" circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" duration="{{1000}}" data-event-opts="{{[['change',[['swiperChange',['$event']]]]]}}" bindchange="__e"><block wx:for="{{bannerList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item><image class="swiper-item" mode src="{{item.bannerImg}}"></image></swiper-item></block></swiper></view><u-notice-bar vue-id="f89668a4-1" bgColor="none" icon="volume-fill" color="#6F4F23" direction="column" fontSize="{{26}}" text="{{textList}}" bind:__l="__l"></u-notice-bar></view>

+ 0 - 4
unpackage/dist/dev/mp-weixin/components/zs-banner/index.wxss

@@ -41,7 +41,6 @@
   align-items: flex-end;
   justify-content: center;
   box-sizing: border-box;
-  padding-bottom: 6rpx;
 }
 .zs-banner .position-box .position {
   position: absolute;
@@ -61,7 +60,6 @@
 }
 .zs-banner .position-box .search-box {
   width: 380rpx;
-  height: 60rpx;
   background: #FFFFFF;
   border-radius: 30rpx;
   position: absolute;
@@ -78,8 +76,6 @@
           transform: translateY(-50%);
 }
 .zs-banner .position-box .search-box .search {
-  line-height: 60rpx;
-  height: 60rpx;
   padding-left: 80rpx;
 }
 .zs-banner .top-box {

+ 3 - 3
unpackage/dist/dev/mp-weixin/login/login/login.js

@@ -104,13 +104,13 @@ try {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 712))
     },
     "u-Form": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 720))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 728))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 726))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 734))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 734))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 742))
     },
   }
 } catch (e) {

+ 3 - 3
unpackage/dist/dev/mp-weixin/login/login/otherLogin.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     "u-Form": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 720))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--form/u--form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--form/u--form")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--form/u--form.vue */ 728))
     },
     uFormItem: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 726))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-form-item/u-form-item.vue */ 734))
     },
     "u-Input": function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 734))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u--input/u--input.vue */ 742))
     },
     uPopup: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 712))

+ 1 - 1
unpackage/dist/dev/mp-weixin/my/order/detail.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uOverlay: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-overlay/u-overlay.vue */ 740))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-overlay/u-overlay.vue */ 748))
     },
     uqrcode: function () {
       return Promise.all(/*! import() | uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode")]).then(__webpack_require__.bind(null, /*! @/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode.vue */ 702))

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -304,7 +304,6 @@ var _shop = __webpack_require__(/*! @/api/shop.js */ 168);
 //
 //
 //
-//
 
 // 腾讯地图
 var QQMapWX = __webpack_require__(/*! ../../libs/qqmap-wx-jssdk.min.js */ 169);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 0 - 5
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -149,11 +149,6 @@
   width: 340rpx;
   height: 444rpx;
 }
-.home .login-home .zs-list .right .video-vip {
-  width: 340rpx;
-  height: 244rpx;
-  border-radius: 16rpx;
-}
 .home .login-home .zs-list .store-item {
   width: 340rpx;
   margin-bottom: 25rpx;

+ 1 - 16
unpackage/dist/dev/mp-weixin/project.config.json

@@ -28,19 +28,4 @@
     },
     "conversation": {
       "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
-}
+    

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--form/u--form.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uview-ui/components/u--form/u--form"],{
 
-/***/ 720:
+/***/ 728:
 /*!***************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--form/u--form.vue ***!
   \***************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--form.vue?vue&type=template&id=5e58019d& */ 721);
-/* harmony import */ var _u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--form.vue?vue&type=script&lang=js& */ 723);
+/* harmony import */ var _u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--form.vue?vue&type=template&id=5e58019d& */ 729);
+/* harmony import */ var _u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--form.vue?vue&type=script&lang=js& */ 731);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/uview-ui/components/u--form/u--form.vue"
 
 /***/ }),
 
-/***/ 721:
+/***/ 729:
 /*!**********************************************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--form/u--form.vue?vue&type=template&id=5e58019d& ***!
   \**********************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/uview-ui/components/u--form/u--form.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--form.vue?vue&type=template&id=5e58019d& */ 722);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--form.vue?vue&type=template&id=5e58019d& */ 730);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_template_id_5e58019d___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 722:
+/***/ 730:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--form/u--form.vue?vue&type=template&id=5e58019d& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -88,7 +88,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 723:
+/***/ 731:
 /*!****************************************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--form/u--form.vue?vue&type=script&lang=js& ***!
   \****************************************************************************************************************/
@@ -97,14 +97,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--form.vue?vue&type=script&lang=js& */ 724);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--form.vue?vue&type=script&lang=js& */ 732);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_form_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 724:
+/***/ 732:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--form/u--form.vue?vue&type=script&lang=js& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -119,7 +119,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ../u-form/props.js */ 725));
+var _props = _interopRequireDefault(__webpack_require__(/*! ../u-form/props.js */ 733));
 var uvForm = function uvForm() {
   Promise.all(/*! require.ensure | uni_modules/uview-ui/components/u-form/u-form */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-form/u-form")]).then((function () {
     return resolve(__webpack_require__(/*! ../u-form/u-form.vue */ 865));
@@ -177,7 +177,7 @@ exports.default = _default;
     'uni_modules/uview-ui/components/u--form/u--form-create-component',
     {
         'uni_modules/uview-ui/components/u--form/u--form-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(720))
+            __webpack_require__('2')['createComponent'](__webpack_require__(728))
         })
     },
     [['uni_modules/uview-ui/components/u--form/u--form-create-component']]

+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u--input/u--input.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uview-ui/components/u--input/u--input"],{
 
-/***/ 734:
+/***/ 742:
 /*!*****************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--input/u--input.vue ***!
   \*****************************************************************************************/
@@ -9,8 +9,8 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--input.vue?vue&type=template&id=c39ebc6e& */ 735);
-/* harmony import */ var _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--input.vue?vue&type=script&lang=js& */ 737);
+/* harmony import */ var _u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./u--input.vue?vue&type=template&id=c39ebc6e& */ 743);
+/* harmony import */ var _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./u--input.vue?vue&type=script&lang=js& */ 745);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 35);
 
@@ -39,7 +39,7 @@ component.options.__file = "uni_modules/uview-ui/components/u--input/u--input.vu
 
 /***/ }),
 
-/***/ 735:
+/***/ 743:
 /*!************************************************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--input/u--input.vue?vue&type=template&id=c39ebc6e& ***!
   \************************************************************************************************************************/
@@ -48,7 +48,7 @@ component.options.__file = "uni_modules/uview-ui/components/u--input/u--input.vu
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=template&id=c39ebc6e& */ 736);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=template&id=c39ebc6e& */ 744);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_template_id_c39ebc6e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -61,7 +61,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 736:
+/***/ 744:
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--input/u--input.vue?vue&type=template&id=c39ebc6e& ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -102,7 +102,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 737:
+/***/ 745:
 /*!******************************************************************************************************************!*\
   !*** F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--input/u--input.vue?vue&type=script&lang=js& ***!
   \******************************************************************************************************************/
@@ -111,14 +111,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=script&lang=js& */ 738);
+/* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./u--input.vue?vue&type=script&lang=js& */ 746);
 /* harmony import */ var _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_D_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_D_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_u_input_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 738:
+/***/ 746:
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!F:/项目/HBuilderProjects/test/uni_modules/uview-ui/components/u--input/u--input.vue?vue&type=script&lang=js& ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -133,7 +133,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ../u-input/props.js */ 739));
+var _props = _interopRequireDefault(__webpack_require__(/*! ../u-input/props.js */ 747));
 var uvInput = function uvInput() {
   __webpack_require__.e(/*! require.ensure | uni_modules/uview-ui/components/u-input/u-input */ "uni_modules/uview-ui/components/u-input/u-input").then((function () {
     return resolve(__webpack_require__(/*! ../u-input/u-input.vue */ 871));
@@ -157,7 +157,7 @@ exports.default = _default;
     'uni_modules/uview-ui/components/u--input/u--input-create-component',
     {
         'uni_modules/uview-ui/components/u--input/u--input-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(734))
+            __webpack_require__('2')['createComponent'](__webpack_require__(742))
         })
     },
     [['uni_modules/uview-ui/components/u--input/u--input-create-component']]

Разница между файлами не показана из-за своего большого размера
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form-item/u-form-item.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-form/u-form.js

@@ -123,7 +123,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 61));
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 725));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 733));
 var _asyncValidator = _interopRequireDefault(__webpack_require__(/*! ../../libs/util/async-validator */ 870));
 //
 //

+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js

@@ -155,7 +155,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 739));
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props.js */ 747));
 //
 //
 //

Разница между файлами не показана из-за своего большого размера
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js


Разница между файлами не показана из-за своего большого размера
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js

@@ -86,7 +86,7 @@ try {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-toolbar/u-toolbar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-toolbar/u-toolbar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-toolbar/u-toolbar.vue */ 923))
     },
     uLoadingIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 779))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loading-icon/u-loading-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loading-icon/u-loading-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.vue */ 720))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uOverlay: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-overlay/u-overlay.vue */ 740))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-overlay/u-overlay */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-overlay/u-overlay")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-overlay/u-overlay.vue */ 748))
     },
     uTransition: function () {
       return Promise.all(/*! import() | uni_modules/uview-ui/components/u-transition/u-transition */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-transition/u-transition")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-transition/u-transition.vue */ 839))

+ 2 - 2
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 78 - 71
utils/request.js

@@ -2,89 +2,96 @@
 // const BASE_URL = 'http://192.168.110.153:9002'
 // const BASE_URL = 'https://zswl.api.jpy.wang/zswl-cloud-bdb'
 // const BASE_URL = 'https://api.dev.zonelife.cn'
-import {BASE_URL} from '@/utils/config.js'
+import {
+	BASE_URL
+} from '@/utils/config.js'
 
 //封装请求方法
 export const request = (options) => {
 	return new Promise((resolve, reject) => {
-		//请求路径拼接,,其中options.url就是通过下面方法myRequest获取到接口部分的url
-		//method--请求方法,不是method的post就是get
-		//请求的参数,当没有参数的时候就是空对象
-		uni.request({
-			url:BASE_URL +options.url,
-			method: options.method || 'GET',
-			data: options.data || {},
-			header: {
-				accessToken: uni.getStorageSync('token')
-			},
-			success: (res) => {
-				if (res.statusCode !== 200) {
-					return uni.showToast({
-						title: '获取失败'
-					})
-					// uni.hideLoading()
-				} else if (res.data.msg != '成功') {//接口返回报错
-					uni.showToast({
-						title: res.data.msg||res.data.exception.message || '请求失败',
-						icon: 'error'
-					})
-					console.log('报错:', res);
+			//请求路径拼接,,其中options.url就是通过下面方法myRequest获取到接口部分的url
+			//method--请求方法,不是method的post就是get
+			//请求的参数,当没有参数的时候就是空对象
+			uni.request({
+					url: BASE_URL + options.url,
+					method: options.method || 'GET',
+					data: options.data || {},
+					header: {
+						accessToken: uni.getStorageSync('token')
+					},
+					success: (res) => {
+						if (res.statusCode !== 200) {
+							return uni.showToast({
+								title: '获取失败'
+							})
+							// uni.hideLoading()
+						} else if (res.data.msg != '成功') { //接口返回报错
+							uni.showToast({
+								title: res.data.msg || res.data.exception.message || '请求失败',
+								icon: 'error'
+							})
+							console.log('报错:', res);
 
-					// token过期或出了问题
-					if (res.data.exception&&res.data.exception.type ==
-						'AuthenticationCredentialsNotFoundException') {
-							if(!uni.getStorageSync('refreshToken')){
-								uni.showToast({
-									title:'登录失效',
-									icon:'fail'
-								})
-								uni.clearStorageSync()
-								uni.reLaunch({
-									url:'/pages/index/index'
-								})
-							}
-						// 刷新token
-						uni.request({
-							url: BASE_URL + '/zswl-cloud-bdb/user/refreshToken',
-							method: 'GET',
-							data: {
-								refreshToken: uni.getStorageSync('refreshToken')
-							},
-							success(r) {
-								if(r.data.content == '刷新令牌错误'){
-									uni.showToast({
-										title:'登录失效',
-										icon:'fail'
+							// token过期或出了问题
+							if (res.data.exception && res.data.exception.type ==
+								'AuthenticationCredentialsNotFoundException') {
+									uni.showLoading({
+										title: '刷新登录中',
 									})
+								if (!uni.getStorageSync('refreshToken')) {
 									uni.clearStorageSync()
 									uni.reLaunch({
-										url:'/pages/index/index'
-									})
-								}else{
-									
-									uni.setStorageSync('token', r.data.content) //登录状态
-									// 刷新页面
-									var pages = getCurrentPages();
-									var url = '/' + pages[pages.length - 1].route
-									uni.reLaunch({
-										url
+										url: '/pages/index/index'
 									})
 								}
-							}
-						})
+								// 刷新token
+								uni.request({
+										url: BASE_URL + '/zswl-cloud-bdb/user/refreshToken',
+										method: 'GET',
+										data: {
+											refreshToken: uni.getStorageSync('refreshToken')
+										},
+										success(r) {
+											uni.hideLoading()
+											if (r.data.content == '刷新令牌错误') {
+												uni.showToast({
+													title: '登录失效',
+													icon: 'fail'
+												})
+												uni.clearStorageSync()
+												uni.reLaunch({
+													url: '/pages/index/index'
+												})
+											} else {
+												
+												uni.setStorageSync('token', r.data.content) //登录状态
+												// 刷新页面
+												let list = ['/pay/pay']
+												var pages = getCurrentPages();
+												var url = '/' + pages[pages.length - 1].route
+												if(list.indexOf(url) == -1){
+													console.log(11111111,list.indexOf(url),url);
+													uni.reLaunch({
+														url
+													})
+												}
+												
+										}
+									}
+								})
+						}
+
 					}
 
+					resolve(res.data)
+				},
+				//请求失败
+				fail: (err) => {
+					uni.showToast({
+						title: '请求接口失败'
+					})
+					reject(err)
 				}
-
-				resolve(res.data)
-			},
-			//请求失败
-			fail: (err) => {
-				uni.showToast({
-					title: '请求接口失败'
-				})
-				reject(err)
-			}
-		})
+			})
 	})
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов