zhaogongxue 1 year ago
parent
commit
13534d20b3
52 changed files with 327 additions and 668 deletions
  1. 31 24
      components/d-rili/d-rili.vue
  2. 129 2
      pageA/everyday.vue
  3. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  4. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/d-rili/d-rili.js.map
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/address.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/commodity.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/duihuan.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/everyday.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shopping/shopping.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/submit.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/tongzhi.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/xiaoxi.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageA/xuyuan.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-number-box/u-number-box.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio-group/u-radio-group.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio/u-radio.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  29. 35 15
      unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.js
  30. 1 1
      unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.wxml
  31. 2 7
      unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.wxss
  32. 52 0
      unpackage/dist/dev/mp-weixin/pageA/everyday.js
  33. 0 1
      unpackage/dist/dev/mp-weixin/pageA/everyday.wxml
  34. 64 3
      unpackage/dist/dev/mp-weixin/pageA/everyday.wxss
  35. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
  36. 0 4
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.json
  37. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.wxml
  38. 0 237
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.wxss
  39. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.js
  40. 0 8
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.json
  41. 0 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.wxml
  42. 0 167
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.wxss
  43. 12 12
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.js
  44. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.js
  45. 0 4
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.json
  46. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxml
  47. 0 45
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxss
  48. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js
  49. 0 7
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.json
  50. 0 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxml
  51. 0 123
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxss
  52. 1 1
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-switch/u-switch.js

+ 31 - 24
components/d-rili/d-rili.vue

@@ -8,10 +8,12 @@
 					<view class="signWrapperCalendarBox">
 						<!--滑动日历-->
 						<!-- @change="_onClickSlideApi" -->
-						<swiper duration="200" :current="slideDataListIndex" circular style="height:820rpx">
+						<!-- :style="{height:swiperHeight + 'px'}" -->
+						<swiper duration="200" :current="slideDataListIndex" circular style="padding-bottom: 30rpx;height: 860rpx;"
+							>
 							<swiper-item class="swiper-item" v-for="(calendar,indexa) in 3" :key="indexa">
 								<!-- <view class="signWrapperCalendarBoxTop"> -->
-									<!-- {{year}}年{{month<10?'0'+month:month}}月 -->
+								<!-- {{year}}年{{month<10?'0'+month:month}}月 -->
 								<!-- </view> -->
 								<view class="signWrapperCalendarBoxCenter">
 									<view class="signWrapperCalendarBoxCenterBox">
@@ -61,14 +63,28 @@
 				dayList: [],
 				start_time: '', //	月初的时间戳
 				end_time: '', //	月末的时间戳
+				swiperHeight:0
 			};
 		},
 		created() {
 			console.log('created')
-
+			// var mySwiper = new Swiper('.swiper-container', {
+			//     autoHeight: true,
+			// });
 			this._onLoad()
+			this.getElementHeight('.swiper-item ' )
 		},
 		methods: {
+			getElementHeight(element) {
+				//一定要 this.$nextTick 完成之后在获取dom节点高度
+				this.$nextTick(() => {
+					let query = uni.createSelectorQuery().in(this);
+					query.select(element).boundingClientRect(data => {
+						console.log('111',data.height);
+						this.swiperHeight = data.height;
+					}).exec()
+				})
+			},
 			async _onLoad() {
 				//	获取当前时间 	赋值年,月
 				await this.initTime()
@@ -353,35 +369,28 @@
 <style lang="scss">
 	.riliWrapper {
 		width: 100%;
-		// height: 499rpx;
-		// background-color: #9bf;
-		// padding: 0 5%;
 		display: flex;
 		justify-content: center;
 
 		.riliWrapperBox {
 			width: 100%;
-			// height: 499rpx;
-			// background-color: #9bf;
 		}
 
 		//	日历
 		.signWrapperCalendar {
 			margin-top: 30rpx;
-
 			width: 100%;
-			border: 3rpx solid #9bf;
+			// border: 3rpx solid #9bf;
 
 			.signWrapperCalendarBox {
-				width: 100%;
-				// height: 499rpx;
+				width: 702rpx;
 				background: #FFFFFF;
-				border-radius: 10rpx;
+				border-radius: 36rpx;
 
 				// background-color: #9bf;
 				.signWrapperCalendarBoxTop {
 					width: 100%;
-					height: 72rpx;
+					// height: 72rpx;
 					// background-color: red;
 					display: flex;
 					align-items: center;
@@ -398,7 +407,7 @@
 
 				.signWrapperCalendarBoxCenter {
 					width: 100%;
-					height: 425rpx;
+					// height: 425rpx;
 					// background-color: #fff;
 					// padding: 30rpx 30rpx;
 					padding: 30rpx 0rpx;
@@ -407,7 +416,7 @@
 
 					.signWrapperCalendarBoxCenterBox {
 						width: 90%;
-						height: 100%;
+						// height: 100%;
 						// background-color: #9000FF;
 
 						.signWrapperCalendarBoxCenterBoxTop {
@@ -429,8 +438,6 @@
 						.signWrapperCalendarBoxCenterBoxFooter {
 							width: 100%;
 
-							// hei
-							// background-color: red;
 							.each-day {
 								position: relative;
 								display: inline-block;
@@ -458,8 +465,8 @@
 										justify-content: center;
 										width: 50rpx;
 										height: 50rpx;
-										background: rgba(255,255,255,0.39);
-										box-shadow: 0rpx 6rpx 12rpx rgba(0,0,0,0.11);
+										background: rgba(255, 255, 255, 0.39);
+										box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.11);
 										border-radius: 50%;
 										font-size: 32rpx;
 										font-family: PingFang SC;
@@ -467,7 +474,7 @@
 										// line-height: 44rpx;
 										color: #323337;
 										padding: 10rpx 14rpx;
-										
+
 									}
 
 								}
@@ -475,7 +482,7 @@
 								//
 								.eachDayBoxCheck {
 									width: 100%;
-									height: 100%;
+									// height: 100%;
 									display: flex;
 									align-items: center;
 									justify-content: center;
@@ -488,8 +495,8 @@
 										align-items: center;
 										justify-content: center;
 										// border: 2rpx solid #8FCCF1;
-										background: rgba(255,255,255,0.39);
-										box-shadow: 0rpx 6rpx 12rpx rgba(0,0,0,0.11);
+										background: rgba(255, 255, 255, 0.39);
+										box-shadow: 0rpx 6rpx 12rpx rgba(0, 0, 0, 0.11);
 										font-size: 32rpx;
 										font-family: PingFang SC;
 										font-weight: 500;

+ 129 - 2
pageA/everyday.vue

@@ -34,6 +34,58 @@
 		<view class="rili">
 			<d-rili></d-rili>
 		</view>
+		<view class="jiangli">
+			<view class="ji">签到奖励</view>
+			<view class="u-flex">
+
+
+				<view class="">
+					<view class="qian u-flex-col u-col-center">
+						<view class="hui">
+
+						</view>
+						<view class="font1">
+							累计签到7天
+						</view>
+						<view class="font2">
+							额外奖励3积分
+						</view>
+					</view>
+				</view>
+				<view class="" style='margin-left:42rpx'>
+					<view class="qian u-flex-col u-col-center">
+						<view class="hui">
+
+						</view>
+						<view class="font1">
+							累计签到17天
+						</view>
+						<view class="font2">
+							额外奖励5积分
+						</view>
+					</view>
+				</view>
+				<view class="" style='margin-left:42rpx'>
+					<view class="qian u-flex-col u-col-center">
+						<view class="hui">
+
+						</view>
+						<view class="font1">
+							累计签到27天
+						</view>
+						<view class="font2">
+							额外奖励7积分
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="" style="height: 136rpx;"></view>
+		<view class="bottom u-flex u-col-center " style="justify-content: center;">
+			<view class="button">
+				做任务赚积分
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -49,10 +101,84 @@
 </script>
 
 <style lang="scss" scoped>
+	.button {
+		width: 420rpx;
+		height: 82rpx;
+		background: linear-gradient(90deg, #B8E7FB 0%, #97D6F6 100%);
+		opacity: 1;
+		border-radius: 42rpx;
+		font-size: 36rpx;
+		font-family: PingFangSC-Regular;
+		font-weight: 400;
+		line-height: 82rpx;
+		color: #FFFFFF;
+		text-align: center;
+	}
+
+	.bottom {
+		width: 750rpx;
+		height: 122rpx;
+		background: rgba(255, 255, 255, 1);
+		position: fixed;
+		bottom: 0;
+		left: 0;
+	}
+
+	.ji {
+		font-size: 30rpx;
+		font-family: PingFangSC-Regular;
+		font-weight: 500;
+		line-height: 42rpx;
+		color: #323337;
+		margin-bottom: 18rpx;
+	}
+
+	.hui {
+		width: 50rpx;
+		height: 50rpx;
+		background: rgba(187, 187, 187, 1);
+	}
+
+	.font1 {
+		font-size: 24rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		line-height: 34rpx;
+		color: #7A7A7A;
+		margin-top: 16rpx;
+	}
+
+	.font2 {
+		font-size: 20rpx;
+		font-family: PingFangSC-Regular;
+		font-weight: 400;
+		line-height: 28rpx;
+		color: #959595;
+	}
+
+	.qian {
+
+		width: 184rpx;
+		height: 176rpx;
+		background: rgba(239, 239, 240, 1);
+		border-radius: 16rpx;
+		padding: 25rpx 0 22rpx 0;
+	}
+
+	.jiangli {
+		margin-top: 40rpx;
+		width: 692rpx;
+		height: 316rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 34rpx;
+		padding: 34rpx 24rpx 0;
+	}
+
 	.rili {
 		// width: 702rpx;
-		height: 848rpx;
-		padding:0 24rpx;
+		// height: 848rpx;
+		// padding:0 24rpx;
+		// border-radius: 36rpx;
 	}
 
 	.guize {
@@ -118,6 +244,7 @@
 		width: 750rpx;
 		min-height: 120vh;
 		background: linear-gradient(180deg, #CFF4FE 0%, #D5E5FF 41%, #8FCCF1 100%);
+		padding: 0 24rpx;
 	}
 
 	.index-navbar {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/d-rili/d-rili.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/address.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/commodity.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/duihuan.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/everyday.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/shopping/shopping.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/submit.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/tongzhi.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/xiaoxi.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageA/xuyuan.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-number-box/u-number-box.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio-group/u-radio-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-radio/u-radio.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


+ 35 - 15
unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.js

@@ -139,7 +139,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -196,6 +196,8 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -210,26 +212,43 @@ var _default = {
       dayList: [],
       start_time: '',
       //	月初的时间戳
-      end_time: '' //	月末的时间戳
+      end_time: '',
+      //	月末的时间戳
+      swiperHeight: 0
     };
   },
   created: function created() {
     console.log('created');
+    // var mySwiper = new Swiper('.swiper-container', {
+    //     autoHeight: true,
+    // });
     this._onLoad();
+    this.getElementHeight('.swiper-item ');
   },
   methods: {
-    _onLoad: function _onLoad() {
+    getElementHeight: function getElementHeight(element) {
       var _this = this;
+      //一定要 this.$nextTick 完成之后在获取dom节点高度
+      this.$nextTick(function () {
+        var query = uni.createSelectorQuery().in(_this);
+        query.select(element).boundingClientRect(function (data) {
+          console.log('111', data.height);
+          _this.swiperHeight = data.height;
+        }).exec();
+      });
+    },
+    _onLoad: function _onLoad() {
+      var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return _this.initTime();
+                return _this2.initTime();
               case 2:
                 _context.next = 4;
-                return _this._runMonth();
+                return _this2._runMonth();
               case 4:
               case "end":
                 return _context.stop();
@@ -249,7 +268,7 @@ var _default = {
       console.log('今日时间为:' + this.year + '-' + this.month + '-' + this.day);
     },
     _runMonth: function _runMonth() {
-      var _this2 = this;
+      var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var dataWeek;
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -260,24 +279,24 @@ var _default = {
 
                 //	获取当前月的每一天的数据	1~31
                 _context2.next = 3;
-                return _this2.initApi();
+                return _this3.initApi();
               case 3:
                 _context2.next = 5;
-                return _this2._timeApi();
+                return _this3._timeApi();
               case 5:
-                console.log(_this2.start_time);
-                console.log(_this2.end_time);
+                console.log(_this3.start_time);
+                console.log(_this3.end_time);
                 //	更新记录
                 // await this.onClickSignLog()
                 _context2.next = 9;
-                return _this2.getweek(_this2._getNowApi());
+                return _this3.getweek(_this3._getNowApi());
               case 9:
                 dataWeek = _context2.sent;
                 // console.log(this._getNowApi())
-                _this2.slideDataList[0] = [];
-                _this2.slideDataList[1] = dataWeek;
-                _this2.slideDataList[2] = [];
-                console.log(_this2.slideDataList);
+                _this3.slideDataList[0] = [];
+                _this3.slideDataList[1] = dataWeek;
+                _this3.slideDataList[2] = [];
+                console.log(_this3.slideDataList);
                 console.log('==============================================================');
               case 15:
               case "end":
@@ -483,6 +502,7 @@ var _default = {
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

+ 1 - 1
unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.wxml

@@ -1 +1 @@
-<view><view class="riliWrapper"><view class="riliWrapperBox"><block wx:if="{{true}}"><view class="signWrapperCalendar"><view class="signWrapperCalendarBox"><swiper style="height:820rpx;" duration="200" current="{{slideDataListIndex}}" circular="{{true}}"><block wx:for="{{$root.l1}}" wx:for-item="calendar" wx:for-index="indexa" wx:key="indexa"><swiper-item class="swiper-item"><view class="signWrapperCalendarBoxCenter"><view class="signWrapperCalendarBoxCenterBox"><view class="signWrapperCalendarBoxCenterBoxTop"><view class="week-number _div"><block wx:for="{{calendar.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><label style="{{'color:'+(item.g0)+';'}}" class="_span">{{item.$orig}}</label></block></view></view><view class="signWrapperCalendarBoxCenterBoxFooter"><block wx:for="{{dayList}}" wx:for-item="dayTime" wx:for-index="idx" wx:key="idx"><view class="each-day"><block wx:if="{{day}}"><view class="{{[dayTime!=day+2?'eachDayBox':'eachDayBoxCheck']}}"><block wx:if="{{dayTime}}"><view class="eachDayBoxBox " style="{{(dayTime==day?'border: 1rpx solid #8FCCF1;':'')}}">{{''+(dayTime?dayTime:'')+''}}</view></block></view></block></view></block></view></view></view></swiper-item></block></swiper></view></view></block></view></view></view>
+<view><view class="riliWrapper"><view class="riliWrapperBox"><block wx:if="{{true}}"><view class="signWrapperCalendar"><view class="signWrapperCalendarBox"><swiper style="padding-bottom:30rpx;height:860rpx;" duration="200" current="{{slideDataListIndex}}" circular="{{true}}"><block wx:for="{{$root.l1}}" wx:for-item="calendar" wx:for-index="indexa" wx:key="indexa"><swiper-item class="swiper-item"><view class="signWrapperCalendarBoxCenter"><view class="signWrapperCalendarBoxCenterBox"><view class="signWrapperCalendarBoxCenterBoxTop"><view class="week-number _div"><block wx:for="{{calendar.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><label style="{{'color:'+(item.g0)+';'}}" class="_span">{{item.$orig}}</label></block></view></view><view class="signWrapperCalendarBoxCenterBoxFooter"><block wx:for="{{dayList}}" wx:for-item="dayTime" wx:for-index="idx" wx:key="idx"><view class="each-day"><block wx:if="{{day}}"><view class="{{[dayTime!=day+2?'eachDayBox':'eachDayBoxCheck']}}"><block wx:if="{{dayTime}}"><view class="eachDayBoxBox " style="{{(dayTime==day?'border: 1rpx solid #8FCCF1;':'')}}">{{''+(dayTime?dayTime:'')+''}}</view></block></view></block></view></block></view></view></view></swiper-item></block></swiper></view></view></block></view></view></view>

+ 2 - 7
unpackage/dist/dev/mp-weixin/components/d-rili/d-rili.wxss

@@ -35,16 +35,14 @@
 .riliWrapper .signWrapperCalendar {
   margin-top: 30rpx;
   width: 100%;
-  border: 3rpx solid #9bf;
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox {
-  width: 100%;
+  width: 702rpx;
   background: #FFFFFF;
-  border-radius: 10rpx;
+  border-radius: 36rpx;
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox .signWrapperCalendarBoxTop {
   width: 100%;
-  height: 72rpx;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -56,14 +54,12 @@
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox .signWrapperCalendarBoxCenter {
   width: 100%;
-  height: 425rpx;
   padding: 30rpx 0rpx;
   display: flex;
   justify-content: center;
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox .signWrapperCalendarBoxCenter .signWrapperCalendarBoxCenterBox {
   width: 90%;
-  height: 100%;
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox .signWrapperCalendarBoxCenter .signWrapperCalendarBoxCenterBox .signWrapperCalendarBoxCenterBoxTop .week-number {
   background: #fff;
@@ -115,7 +111,6 @@
 }
 .riliWrapper .signWrapperCalendar .signWrapperCalendarBox .signWrapperCalendarBoxCenter .signWrapperCalendarBoxCenterBox .signWrapperCalendarBoxCenterBoxFooter .each-day .eachDayBoxCheck {
   width: 100%;
-  height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;

+ 52 - 0
unpackage/dist/dev/mp-weixin/pageA/everyday.js

@@ -209,6 +209,58 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {

File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/mp-weixin/pageA/everyday.wxml


+ 64 - 3
unpackage/dist/dev/mp-weixin/pageA/everyday.wxss

@@ -24,9 +24,69 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.rili.data-v-254b6ae8 {
-  height: 848rpx;
-  padding: 0 24rpx;
+.button.data-v-254b6ae8 {
+  width: 420rpx;
+  height: 82rpx;
+  background: linear-gradient(90deg, #B8E7FB 0%, #97D6F6 100%);
+  opacity: 1;
+  border-radius: 42rpx;
+  font-size: 36rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  line-height: 82rpx;
+  color: #FFFFFF;
+  text-align: center;
+}
+.bottom.data-v-254b6ae8 {
+  width: 750rpx;
+  height: 122rpx;
+  background: white;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+.ji.data-v-254b6ae8 {
+  font-size: 30rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 500;
+  line-height: 42rpx;
+  color: #323337;
+  margin-bottom: 18rpx;
+}
+.hui.data-v-254b6ae8 {
+  width: 50rpx;
+  height: 50rpx;
+  background: #bbbbbb;
+}
+.font1.data-v-254b6ae8 {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  line-height: 34rpx;
+  color: #7A7A7A;
+  margin-top: 16rpx;
+}
+.font2.data-v-254b6ae8 {
+  font-size: 20rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  line-height: 28rpx;
+  color: #959595;
+}
+.qian.data-v-254b6ae8 {
+  width: 184rpx;
+  height: 176rpx;
+  background: #efeff0;
+  border-radius: 16rpx;
+  padding: 25rpx 0 22rpx 0;
+}
+.jiangli.data-v-254b6ae8 {
+  margin-top: 40rpx;
+  width: 692rpx;
+  height: 316rpx;
+  background: white;
+  border-radius: 34rpx;
+  padding: 34rpx 24rpx 0;
 }
 .guize.data-v-254b6ae8 {
   font-size: 22rpx;
@@ -85,6 +145,7 @@
   width: 750rpx;
   min-height: 120vh;
   background: linear-gradient(180deg, #CFF4FE 0%, #D5E5FF 41%, #8FCCF1 100%);
+  padding: 0 24rpx;
 }
 .index-navbar.data-v-254b6ae8 {
   position: -webkit-sticky;

+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.json

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.wxml

@@ -1 +0,0 @@
-<button class="{{['u-btn','u-line-1','u-fix-ios-appearance','data-v-6e15e680','u-size-'+size,plain?'u-btn--'+type+'--plain':'',loading?'u-loading':'',shape=='circle'?'u-round-circle':'',hairLine?showHairLineBorder:'u-btn--bold-border','u-btn--'+type,disabled?'u-btn--'+type+'--disabled':'']}}" style="{{$root.s0}}" id="u-wave-btn" hover-start-time="{{$root.m0}}" hover-stay-time="{{$root.m1}}" disabled="{{disabled}}" form-type="{{formType}}" open-type="{{openType}}" app-parameter="{{appParameter}}" hover-stop-propagation="{{hoverStopPropagation}}" send-message-title="{{sendMessageTitle}}" send-message-path="sendMessagePath" lang="{{lang}}" data-name="{{dataName}}" session-from="{{sessionFrom}}" send-message-img="{{sendMessageImg}}" show-message-card="{{showMessageCard}}" hover-class="{{getHoverClass}}" loading="{{loading}}" data-event-opts="{{[['getphonenumber',[['getphonenumber',['$event']]]],['getuserinfo',[['getuserinfo',['$event']]]],['error',[['error',['$event']]]],['opensetting',[['opensetting',['$event']]]],['launchapp',[['launchapp',['$event']]]],['tap',[['click',['$event']]]]]}}" bindgetphonenumber="__e" bindgetuserinfo="__e" binderror="__e" bindopensetting="__e" bindlaunchapp="__e" catchtap="__e"><slot></slot><block wx:if="{{ripple}}"><view class="{{['u-wave-ripple','data-v-6e15e680',waveActive?'u-wave-active':'']}}" style="{{'top:'+(rippleTop+'px')+';'+('left:'+(rippleLeft+'px')+';')+('width:'+(fields.targetWidth+'px')+';')+('height:'+(fields.targetWidth+'px')+';')+('background-color:'+(rippleBgColor||'rgba(0, 0, 0, 0.15)')+';')}}"></view></block></button>

+ 0 - 237
unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.wxss

@@ -1,237 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-btn.data-v-6e15e680::after {
-  border: none;
-}
-.u-btn.data-v-6e15e680 {
-  position: relative;
-  border: 0;
-  display: inline-flex;
-  overflow: visible;
-  line-height: 1;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  padding: 0 40rpx;
-  z-index: 1;
-  box-sizing: border-box;
-  transition: all 0.15s;
-}
-.u-btn--bold-border.data-v-6e15e680 {
-  border: 1px solid #ffffff;
-}
-.u-btn--default.data-v-6e15e680 {
-  color: #606266;
-  border-color: #c0c4cc;
-  background-color: #ffffff;
-}
-.u-btn--primary.data-v-6e15e680 {
-  color: #ffffff;
-  border-color: #2979ff;
-  background-color: #2979ff;
-}
-.u-btn--success.data-v-6e15e680 {
-  color: #ffffff;
-  border-color: #19be6b;
-  background-color: #19be6b;
-}
-.u-btn--error.data-v-6e15e680 {
-  color: #ffffff;
-  border-color: #fa3534;
-  background-color: #fa3534;
-}
-.u-btn--warning.data-v-6e15e680 {
-  color: #ffffff;
-  border-color: #ff9900;
-  background-color: #ff9900;
-}
-.u-btn--default--disabled.data-v-6e15e680 {
-  color: #ffffff;
-  border-color: #e4e7ed;
-  background-color: #ffffff;
-}
-.u-btn--primary--disabled.data-v-6e15e680 {
-  color: #ffffff !important;
-  border-color: #a0cfff !important;
-  background-color: #a0cfff !important;
-}
-.u-btn--success--disabled.data-v-6e15e680 {
-  color: #ffffff !important;
-  border-color: #71d5a1 !important;
-  background-color: #71d5a1 !important;
-}
-.u-btn--error--disabled.data-v-6e15e680 {
-  color: #ffffff !important;
-  border-color: #fab6b6 !important;
-  background-color: #fab6b6 !important;
-}
-.u-btn--warning--disabled.data-v-6e15e680 {
-  color: #ffffff !important;
-  border-color: #fcbd71 !important;
-  background-color: #fcbd71 !important;
-}
-.u-btn--primary--plain.data-v-6e15e680 {
-  color: #2979ff !important;
-  border-color: #a0cfff !important;
-  background-color: #ecf5ff !important;
-}
-.u-btn--success--plain.data-v-6e15e680 {
-  color: #19be6b !important;
-  border-color: #71d5a1 !important;
-  background-color: #dbf1e1 !important;
-}
-.u-btn--error--plain.data-v-6e15e680 {
-  color: #fa3534 !important;
-  border-color: #fab6b6 !important;
-  background-color: #fef0f0 !important;
-}
-.u-btn--warning--plain.data-v-6e15e680 {
-  color: #ff9900 !important;
-  border-color: #fcbd71 !important;
-  background-color: #fdf6ec !important;
-}
-.u-hairline-border.data-v-6e15e680:after {
-  content: ' ';
-  position: absolute;
-  pointer-events: none;
-  box-sizing: border-box;
-  -webkit-transform-origin: 0 0;
-  transform-origin: 0 0;
-  left: 0;
-  top: 0;
-  width: 199.8%;
-  height: 199.7%;
-  -webkit-transform: scale(0.5, 0.5);
-  transform: scale(0.5, 0.5);
-  border: 1px solid currentColor;
-  z-index: 1;
-}
-.u-wave-ripple.data-v-6e15e680 {
-  z-index: 0;
-  position: absolute;
-  border-radius: 100%;
-  background-clip: padding-box;
-  pointer-events: none;
-  -webkit-user-select: none;
-          user-select: none;
-  -webkit-transform: scale(0);
-          transform: scale(0);
-  opacity: 1;
-  -webkit-transform-origin: center;
-          transform-origin: center;
-}
-.u-wave-ripple.u-wave-active.data-v-6e15e680 {
-  opacity: 0;
-  -webkit-transform: scale(2);
-          transform: scale(2);
-  transition: opacity 1s linear, -webkit-transform 0.4s linear;
-  transition: opacity 1s linear, transform 0.4s linear;
-  transition: opacity 1s linear, transform 0.4s linear, -webkit-transform 0.4s linear;
-}
-.u-round-circle.data-v-6e15e680 {
-  border-radius: 100rpx;
-}
-.u-round-circle.data-v-6e15e680::after {
-  border-radius: 100rpx;
-}
-.u-loading.data-v-6e15e680::after {
-  background-color: rgba(255, 255, 255, 0.35);
-}
-.u-size-default.data-v-6e15e680 {
-  font-size: 30rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-}
-.u-size-medium.data-v-6e15e680 {
-  display: inline-flex;
-  width: auto;
-  font-size: 26rpx;
-  height: 70rpx;
-  line-height: 70rpx;
-  padding: 0 80rpx;
-}
-.u-size-mini.data-v-6e15e680 {
-  display: inline-flex;
-  width: auto;
-  font-size: 22rpx;
-  padding-top: 1px;
-  height: 50rpx;
-  line-height: 50rpx;
-  padding: 0 20rpx;
-}
-.u-primary-plain-hover.data-v-6e15e680 {
-  color: #ffffff !important;
-  background: #2b85e4 !important;
-}
-.u-default-plain-hover.data-v-6e15e680 {
-  color: #2b85e4 !important;
-  background: #ecf5ff !important;
-}
-.u-success-plain-hover.data-v-6e15e680 {
-  color: #ffffff !important;
-  background: #18b566 !important;
-}
-.u-warning-plain-hover.data-v-6e15e680 {
-  color: #ffffff !important;
-  background: #f29100 !important;
-}
-.u-error-plain-hover.data-v-6e15e680 {
-  color: #ffffff !important;
-  background: #dd6161 !important;
-}
-.u-info-plain-hover.data-v-6e15e680 {
-  color: #ffffff !important;
-  background: #82848a !important;
-}
-.u-default-hover.data-v-6e15e680 {
-  color: #2b85e4 !important;
-  border-color: #2b85e4 !important;
-  background-color: #ecf5ff !important;
-}
-.u-primary-hover.data-v-6e15e680 {
-  background: #2b85e4 !important;
-  color: #fff;
-}
-.u-success-hover.data-v-6e15e680 {
-  background: #18b566 !important;
-  color: #fff;
-}
-.u-info-hover.data-v-6e15e680 {
-  background: #82848a !important;
-  color: #fff;
-}
-.u-warning-hover.data-v-6e15e680 {
-  background: #f29100 !important;
-  color: #fff;
-}
-.u-error-hover.data-v-6e15e680 {
-  background: #dd6161 !important;
-  color: #fff;
-}
-

+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 8
unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {
-    "u-popup": "/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-button": "/uview-ui/components/u-button/u-button"
-  },
-  "component": true
-}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.wxml


+ 0 - 167
unpackage/dist/dev/mp-weixin/uview-ui/components/u-calendar/u-calendar.wxss

@@ -1,167 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-calendar.data-v-5b667d40 {
-  color: #606266;
-}
-.u-calendar__header.data-v-5b667d40 {
-  width: 100%;
-  box-sizing: border-box;
-  font-size: 30rpx;
-  background-color: #fff;
-  color: #303133;
-}
-.u-calendar__header__text.data-v-5b667d40 {
-  margin-top: 30rpx;
-  padding: 0 60rpx;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-}
-.u-calendar__action.data-v-5b667d40 {
-  padding: 40rpx 0 40rpx 0;
-}
-.u-calendar__action__icon.data-v-5b667d40 {
-  margin: 0 16rpx;
-}
-.u-calendar__action__text.data-v-5b667d40 {
-  padding: 0 16rpx;
-  color: #303133;
-  font-size: 32rpx;
-  line-height: 32rpx;
-  font-weight: bold;
-}
-.u-calendar__week-day.data-v-5b667d40 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 6px 0;
-  overflow: hidden;
-}
-.u-calendar__week-day__text.data-v-5b667d40 {
-  flex: 1;
-  text-align: center;
-}
-.u-calendar__content.data-v-5b667d40 {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  padding: 6px 0;
-  box-sizing: border-box;
-  background-color: #fff;
-  position: relative;
-}
-.u-calendar__content--end-date.data-v-5b667d40 {
-  border-top-right-radius: 8rpx;
-  border-bottom-right-radius: 8rpx;
-}
-.u-calendar__content--start-date.data-v-5b667d40 {
-  border-top-left-radius: 8rpx;
-  border-bottom-left-radius: 8rpx;
-}
-.u-calendar__content__item.data-v-5b667d40 {
-  width: 14.2857%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 6px 0;
-  overflow: hidden;
-  position: relative;
-  z-index: 2;
-}
-.u-calendar__content__item__inner.data-v-5b667d40 {
-  height: 84rpx;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  font-size: 32rpx;
-  position: relative;
-  border-radius: 50%;
-}
-.u-calendar__content__item__inner__desc.data-v-5b667d40 {
-  width: 100%;
-  font-size: 24rpx;
-  line-height: 24rpx;
-  -webkit-transform: scale(0.75);
-          transform: scale(0.75);
-  -webkit-transform-origin: center center;
-          transform-origin: center center;
-  position: absolute;
-  left: 0;
-  text-align: center;
-  bottom: 2rpx;
-}
-.u-calendar__content__item__tips.data-v-5b667d40 {
-  width: 100%;
-  font-size: 24rpx;
-  line-height: 24rpx;
-  position: absolute;
-  left: 0;
-  -webkit-transform: scale(0.8);
-          transform: scale(0.8);
-  -webkit-transform-origin: center center;
-          transform-origin: center center;
-  text-align: center;
-  bottom: 8rpx;
-  z-index: 2;
-}
-.u-calendar__content__bg-month.data-v-5b667d40 {
-  position: absolute;
-  font-size: 130px;
-  line-height: 130px;
-  left: 50%;
-  top: 50%;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
-  color: #e4e7ed;
-  z-index: 1;
-}
-.u-calendar__bottom.data-v-5b667d40 {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  background-color: #fff;
-  padding: 0 40rpx 30rpx;
-  box-sizing: border-box;
-  font-size: 24rpx;
-  color: #909399;
-}
-.u-calendar__bottom__choose.data-v-5b667d40 {
-  height: 50rpx;
-}
-.u-calendar__bottom__btn.data-v-5b667d40 {
-  width: 100%;
-}
-

File diff suppressed because it is too large
+ 12 - 12
unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.js


+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.json

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxml

@@ -1 +0,0 @@
-<view class="{{['u-mask','data-v-4bfa3b00',(zoom)?'u-mask-zoom':'',(show)?'u-mask-show':'']}}" style="{{$root.s0}}" hover-stop-propagation="{{true}}" data-event-opts="{{[['tap',[['click',['$event']]]],['touchmove',[['e0',['$event']]]]]}}" bindtap="__e" catchtouchmove="__e"><slot></slot></view>

+ 0 - 45
unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.wxss

@@ -1,45 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-mask.data-v-4bfa3b00 {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 0;
-  transition: -webkit-transform 0.3s;
-  transition: transform 0.3s;
-  transition: transform 0.3s, -webkit-transform 0.3s;
-}
-.u-mask-show.data-v-4bfa3b00 {
-  opacity: 1;
-}
-.u-mask-zoom.data-v-4bfa3b00 {
-  -webkit-transform: scale(1.2, 1.2);
-          transform: scale(1.2, 1.2);
-}
-

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

@@ -1 +0,0 @@
-Component({})

+ 0 - 7
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.json

@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "u-mask": "/uview-ui/components/u-mask/u-mask",
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxml

@@ -1 +0,0 @@
-<block wx:if="{{visibleSync}}"><view class="u-drawer data-v-17becaea" style="{{$root.s0}}" hover-stop-propagation="{{true}}"><u-mask vue-id="3fc9d948-1" duration="{{duration}}" custom-style="{{maskCustomStyle}}" maskClickAble="{{maskCloseAble}}" z-index="{{uZindex-2}}" show="{{showDrawer&&mask}}" data-event-opts="{{[['^click',[['maskClick']]]]}}" bind:click="__e" class="data-v-17becaea" bind:__l="__l"></u-mask><view data-event-opts="{{[['tap',[['modeCenterClose',['$0'],['mode']],['',['$event']]]],['touchmove',[['',['$event']]]]]}}" class="{{['u-drawer-content','data-v-17becaea',safeAreaInsetBottom?'safe-area-inset-bottom':'','u-drawer-'+mode,showDrawer?'u-drawer-content-visible':'',zoom&&mode=='center'?'u-animation-zoom':'']}}" style="{{$root.s1}}" catchtap="__e" catchtouchmove="__e"><block wx:if="{{mode=='center'}}"><view data-event-opts="{{[['tap',[['',['$event']]]],['touchmove',[['',['$event']]]]]}}" class="u-mode-center-box data-v-17becaea" style="{{$root.s2}}" catchtap="__e" catchtouchmove="__e"><block wx:if="{{closeable}}"><u-icon class="{{['u-close','data-v-17becaea','u-close--'+closeIconPos]}}" vue-id="3fc9d948-2" name="{{closeIcon}}" color="{{closeIconColor}}" size="{{closeIconSize}}" data-event-opts="{{[['^click',[['close']]]]}}" bind:click="__e" bind:__l="__l"></u-icon></block><scroll-view class="u-drawer__scroll-view data-v-17becaea" scroll-y="true"><slot></slot></scroll-view></view></block><block wx:else><scroll-view class="u-drawer__scroll-view data-v-17becaea" scroll-y="true"><slot></slot></scroll-view></block><view data-event-opts="{{[['tap',[['close',['$event']]]]]}}" class="{{['u-close','data-v-17becaea','u-close--'+closeIconPos]}}" bindtap="__e"><block wx:if="{{mode!='center'&&closeable}}"><u-icon vue-id="3fc9d948-3" name="{{closeIcon}}" color="{{closeIconColor}}" size="{{closeIconSize}}" class="data-v-17becaea" bind:__l="__l"></u-icon></block></view></view></view></block>

+ 0 - 123
unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.wxss

@@ -1,123 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-drawer.data-v-17becaea {
-  display: block;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  overflow: hidden;
-}
-.u-drawer-content.data-v-17becaea {
-  display: block;
-  position: absolute;
-  z-index: 1003;
-  transition: all 0.25s linear;
-}
-.u-drawer__scroll-view.data-v-17becaea {
-  width: 100%;
-  height: 100%;
-}
-.u-drawer-left.data-v-17becaea {
-  top: 0;
-  bottom: 0;
-  left: 0;
-  background-color: #ffffff;
-}
-.u-drawer-right.data-v-17becaea {
-  right: 0;
-  top: 0;
-  bottom: 0;
-  background-color: #ffffff;
-}
-.u-drawer-top.data-v-17becaea {
-  top: 0;
-  left: 0;
-  right: 0;
-  background-color: #ffffff;
-}
-.u-drawer-bottom.data-v-17becaea {
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: #ffffff;
-}
-.u-drawer-center.data-v-17becaea {
-  display: flex;
-  flex-direction: row;
-  flex-direction: column;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  top: 0;
-  justify-content: center;
-  align-items: center;
-  opacity: 0;
-  z-index: 99999;
-}
-.u-mode-center-box.data-v-17becaea {
-  min-width: 100rpx;
-  min-height: 100rpx;
-  display: block;
-  position: relative;
-  background-color: #ffffff;
-}
-.u-drawer-content-visible.u-drawer-center.data-v-17becaea {
-  -webkit-transform: scale(1);
-          transform: scale(1);
-  opacity: 1;
-}
-.u-animation-zoom.data-v-17becaea {
-  -webkit-transform: scale(1.15);
-          transform: scale(1.15);
-}
-.u-drawer-content-visible.data-v-17becaea {
-  -webkit-transform: translate3D(0px, 0px, 0px) !important;
-          transform: translate3D(0px, 0px, 0px) !important;
-}
-.u-close.data-v-17becaea {
-  position: absolute;
-  z-index: 3;
-}
-.u-close--top-left.data-v-17becaea {
-  top: 30rpx;
-  left: 30rpx;
-}
-.u-close--top-right.data-v-17becaea {
-  top: 30rpx;
-  right: 30rpx;
-}
-.u-close--bottom-left.data-v-17becaea {
-  bottom: 30rpx;
-  left: 30rpx;
-}
-.u-close--bottom-right.data-v-17becaea {
-  right: 30rpx;
-  bottom: 30rpx;
-}
-

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

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uLoading: function () {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-loading/u-loading */ "uview-ui/components/u-loading/u-loading").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading/u-loading.vue */ 277))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-loading/u-loading */ "uview-ui/components/u-loading/u-loading").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-loading/u-loading.vue */ 263))
     },
   }
 } catch (e) {

Some files were not shown because too many files changed in this diff