12.29

components/d-rili/d-rili.vue

@@ -9,9 +9,10 @@
 						<!--滑动日历-->
 						<!-- @change="_onClickSlideApi" -->
 						<!-- :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">
+						<!-- 					<swiper duration="200" :current="slideDataListIndex" circular style="padding-bottom: 30rpx;height: 860rpx;"
+							> -->
+						<view>
+							<view class="swiper-item" :key="indexa">
 								<!-- <view class="signWrapperCalendarBoxTop"> -->
 								<!-- {{year}}年{{month<10?'0'+month:month}}月 -->
 								<!-- </view> -->
@@ -37,8 +38,10 @@
 										</view>
 									</view>
 								</view>
-							</swiper-item>
-						</swiper>
+								<!-- </swiper-item> -->
+							</view>
+						</view>
+						<!-- </swiper> -->
 						<!--  -->
 					</view>
 				</view>
@@ -56,14 +59,14 @@
 				//	月份数组【2020-08-01	  2020-09-01   2020-10-01】
 				slideDataList: [],
 				//	月份数组的索引
-				slideDataListIndex: 1,
+				// slideDataListIndex: 1,
 				year: 2020,
 				month: 10,
 				day: 10,
 				dayList: [],
 				start_time: '', //	月初的时间戳
 				end_time: '', //	月末的时间戳
-				swiperHeight:0
+				swiperHeight: 0
 			};
 		},
 		created() {
@@ -72,7 +75,7 @@
 			//     autoHeight: true,
 			// });
 			this._onLoad()
-			this.getElementHeight('.swiper-item ' )
+			this.getElementHeight('.swiper-item ')
 		},
 		methods: {
 			getElementHeight(element) {
@@ -80,7 +83,7 @@
 				this.$nextTick(() => {
 					let query = uni.createSelectorQuery().in(this);
 					query.select(element).boundingClientRect(data => {
-						console.log('111',data.height);
+						console.log('111', data.height);
 						this.swiperHeight = data.height;
 					}).exec()
 				})

pageA/address.vue

@@ -33,7 +33,7 @@
 			<view class="add">
 				山东省临沂市兰山区IEC国际企业中心
 			</view>
-			<u-radio-group v-model="value" @change="radioGroupChange">
+			<u-radio-group v-model="value" >
 				<view class="u-flex u-row-between mor">
 					<view class="u-flex">
 						<u-radio @change="radioChange">

pageA/everyday.vue

@@ -37,12 +37,10 @@
 		<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">
-
+							<u-icon name="more-dot-fill" color="#fff" size="28"></u-icon>
 						</view>
 						<view class="font1">
 							累计签到7天
@@ -55,7 +53,7 @@
 				<view class="" style='margin-left:42rpx'>
 					<view class="qian u-flex-col u-col-center">
 						<view class="hui">
-
+							<u-icon name="more-dot-fill" color="#fff" size="28"></u-icon>
 						</view>
 						<view class="font1">
 							累计签到17天
@@ -68,7 +66,7 @@
 				<view class="" style='margin-left:42rpx'>
 					<view class="qian u-flex-col u-col-center">
 						<view class="hui">
-
+							<u-icon name="more-dot-fill" color="#fff" size="28"></u-icon>
 						</view>
 						<view class="font1">
 							累计签到27天
@@ -82,7 +80,7 @@
 		</view>
 		<view class="" style="height: 136rpx;"></view>
 		<view class="bottom u-flex u-col-center " style="justify-content: center;">
-			<view class="button">
+			<view class="button" @click="task">
 				做任务赚积分
 			</view>
 		</view>
@@ -96,6 +94,11 @@
 				show: true,
 				mode: 'date'
 			};
+		},
+		methods:{
+			task(){
+				this.$u.toast('暂未开放')
+			}
 		}
 	}
 </script>
@@ -137,6 +140,10 @@
 		width: 50rpx;
 		height: 50rpx;
 		background: rgba(187, 187, 187, 1);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 50%;
 	}
 
 	.font1 {

pageA/orderinfo.vue

@@ -20,10 +20,15 @@
 					name: '待评价',
 				}, {
 					name: '已完成',
+				}, {
+					name: '售后',
 				}],
 				current: 0
 			};
 		},
+		onLoad(options) {
+			this.current = options.current
+		},
 		methods: {
 			change(index) {
 				this.current = index

pageA/tongzhi.vue

@@ -20,8 +20,16 @@
 	export default {
 		data() {
 			return {
-
+				type:0,
+				title:''
 			};
+		},
+		onLoad(options) {
+			this.type = options.type
+			this.title = options.title
+			uni.setNavigationBarTitle({
+				title:this.title
+			})
 		}
 	}
 </script>

pageA/xiaoxi.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="top">消息通知</view>
 		<view class="box">
-			<view class="item u-flex u-row-between" @click="totongzhi(1)">
+			<view class="item u-flex u-row-between" @click="totongzhi(1,'订单转换通知')">
 				<view class="u-flex">
 					<image style="width: 56rpx;height: 56rpx;" src="" mode=""></image>
 					<text class="font">订单转换通知</text>
@@ -12,7 +12,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="item u-flex u-row-between" @click="totongzhi(2)">
+			<view class="item u-flex u-row-between" @click="totongzhi(2,'直播预告通知')">
 				<view class="u-flex">
 					<image style="width: 56rpx;height: 56rpx;" src="" mode=""></image>
 					<text class="font">直播预告通知</text>
@@ -22,7 +22,7 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="item u-flex u-row-between" @click="totongzhi(3)">
+			<view class="item u-flex u-row-between" @click="totongzhi(3,'等级通知')">
 				<view class="u-flex">
 					<image style="width: 56rpx;height: 56rpx;" src="" mode=""></image>
 					<text class="font">等级通知</text>
@@ -32,7 +32,8 @@
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 			</view>
-			<view class="item u-flex u-row-between" style="border: 1rpx solid rgba(0, 0, 0, 0);" @click="totongzhi(4)">
+			<view class="item u-flex u-row-between" style="border: 1rpx solid rgba(0, 0, 0, 0);"
+				@click="totongzhi(4,'积分通知')">
 				<view class="u-flex">
 					<image style="width: 56rpx;height: 56rpx;" src="" mode=""></image>
 					<text class="font">积分通知</text>
@@ -50,13 +51,13 @@
 	export default {
 		data() {
 			return {
-				
+
 			};
 		},
-		methods:{
-			totongzhi(){
+		methods: {
+			totongzhi(type,title) {
 				uni.navigateTo({
-					url:'/pageA/tongzhi'
+					url: '/pageA/tongzhi?type='+type+'&title='+title
 				})
 			}
 		}

pages/login/login.vue

@@ -75,6 +75,10 @@
 				})
 			},
 			toindex(){
+				if(!this.checked){
+					this.$u.toast('请勾选协议')
+					return
+				}
 				uni.switchTab({
 					url:'/pages/index/index'
 				})

pages/mine/mine.vue

@@ -7,7 +7,7 @@
 			<view class="left">
 				<image style="width: 116rpx;height: 116rpx;border-radius: 50%;" src="" mode=""></image>
 				<view class="" style="margin-left: 22rpx;padding: 20rpx 0 0 0 ;">
-					<text class="login">登录/注册</text>
+					<text class="login" @click="tologin">登录/注册</text>
 					<view class="look">登录后可使用全部功能</view>
 				</view>
 			</view>
@@ -25,33 +25,33 @@
 		<view class="order">
 			<view class="u-flex u-row-between">
 				<text class="order_text">我的订单</text>
-				<view class="u-flex " @click="toorder">
-					<text class="order_all">全部订单</text>
+				<view class="u-flex " @click="toorder(0)">
+					<text class="order_all">全部订单</text>  
 					<u-icon name="arrow-right" color='#999999;' size="16"></u-icon>
 				</view>
 			</view>
 			<view class="icon u-flex u-row-around">
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(1)'>
 					<image style="height: 50rpx;width: 50rpx;" src="/static/images/dfk.png" mode=""></image>
 					<text class="icon_text">待付款</text>
 				</view>
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(2)'>
 					<image style="height: 50rpx;width: 50rpx;" src="/static/images/dfh.png" mode=""></image>
 					<text class="icon_text">待发货</text>
 				</view>
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(3)'>
 					<image style="height: 50rpx;width: 50rpx;" src="/static/images/ywc.png" mode=""></image>
 					<text class="icon_text">待收货</text>
 				</view>
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(4)'>
 					<image style="height: 50rpx;width: 50rpx;" src="" mode=""></image>
 					<text class="icon_text">待评价</text>
 				</view>
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(5)'>
 					<image style="height: 50rpx;width: 50rpx;" src="/static/images/ywc.png" mode=""></image>
 					<text class="icon_text">已完成</text>
 				</view>
-				<view class="u-flex-col u-col-center ">
+				<view class="u-flex-col u-col-center " @click='toorder(6)'>
 					<image style="height: 50rpx;width: 50rpx;" src="" mode=""></image>
 					<text class="icon_text">售后</text>
 				</view>
@@ -102,7 +102,9 @@
 							<view class="order_all">优惠提前知道</view>
 						</view>
 					</view>
-					<button class="u-flex bor" type="default" style="background-color: rgba(0, 0, 0, 0);padding: 0;margin: 0;line-height: 0;margin-left: 0;text-align: left;border: 0rpx solid rgba(0, 0, 0, 0);" open-type="contact" >
+					<button class="u-flex bor" type="default"
+						style="background-color: rgba(0, 0, 0, 0);padding: 0;margin: 0;line-height: 0;margin-left: 0;text-align: left;border: 0rpx solid rgba(0, 0, 0, 0);"
+						open-type="contact">
 						<image style="width: 84rpx;height: 84rpx;" src="/static/images/kefu.png" mode=""></image>
 						<view class="" style="margin-left: 24rpx;">
 							<text class="order_text">我的客服</text>
@@ -168,9 +170,14 @@
 
 		},
 		methods: {
-			toorder() {
+			tologin() {
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+			},
+			toorder(current) {
 				uni.navigateTo({
-					url: '/pageA/orderinfo'
+					url: '/pageA/orderinfo?current=' + current
 				})
 			},
 			toduihuan() {
@@ -193,9 +200,10 @@
 </script>
 
 <style lang="scss">
-	.bor::after{
-		border:none
+	.bor::after {
+		border: none
 	}
+
 	.page {
 		min-height: 100vh;
 		padding: 0 24rpx;

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

@@ -81,20 +81,13 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l1 = true
-    ? _vm.__map(3, function (calendar, indexa) {
-        var $orig = _vm.__get_orig(calendar)
-        var l0 = _vm.__map(_vm.weekList, function (item, index) {
-          var $orig = _vm.__get_orig(item)
-          var g0 = index == 0 || index == _vm.weekList.length - 1
-          return {
-            $orig: $orig,
-            g0: g0,
-          }
-        })
+  var l0 = true
+    ? _vm.__map(_vm.weekList, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var g0 = index == 0 || index == _vm.weekList.length - 1
         return {
           $orig: $orig,
-          l0: l0,
+          g0: g0,
         }
       })
     : undefined
@@ -102,7 +95,7 @@ var render = function () {
     {},
     {
       $root: {
-        l1: l1,
+        l0: l0,
       },
     }
   )
@@ -198,6 +191,9 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -205,7 +201,7 @@ var _default = {
       //	月份数组【2020-08-01	  2020-09-01   2020-10-01】
       slideDataList: [],
       //	月份数组的索引
-      slideDataListIndex: 1,
+      // slideDataListIndex: 1,
       year: 2020,
       month: 10,
       day: 10,

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="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>
+<view><view class="riliWrapper"><view class="riliWrapperBox"><block wx:if="{{true}}"><view class="signWrapperCalendar"><view class="signWrapperCalendarBox"><view><view class="swiper-item"><view class="signWrapperCalendarBoxCenter"><view class="signWrapperCalendarBoxCenterBox"><view class="signWrapperCalendarBoxCenterBoxTop"><view class="week-number _div"><block wx:for="{{$root.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></view></view></view></view></block></view></view></view>

unpackage/dist/dev/mp-weixin/pageA/everyday.js

@@ -259,14 +259,17 @@ exports.default = void 0;
 //
 //
 //
-//
-//
 var _default = {
   data: function data() {
     return {
       show: true,
       mode: 'date'
     };
+  },
+  methods: {
+    task: function task() {
+      this.$u.toast('暂未开放');
+    }
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pageA/everyday.wxss

@@ -57,6 +57,10 @@
   width: 50rpx;
   height: 50rpx;
   background: #bbbbbb;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
 }
 .font1.data-v-254b6ae8 {
   font-size: 24rpx;

unpackage/dist/dev/mp-weixin/pageA/orderinfo.js

@@ -183,10 +183,15 @@ var _default = {
         name: '待评价'
       }, {
         name: '已完成'
+      }, {
+        name: '售后'
       }],
       current: 0
     };
   },
+  onLoad: function onLoad(options) {
+    this.current = options.current;
+  },
   methods: {
     change: function change(index) {
       this.current = index;

unpackage/dist/dev/mp-weixin/pageA/tongzhi.js

@@ -135,7 +135,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -161,10 +161,21 @@ exports.default = void 0;
 //
 var _default = {
   data: function data() {
-    return {};
+    return {
+      type: 0,
+      title: ''
+    };
+  },
+  onLoad: function onLoad(options) {
+    this.type = options.type;
+    this.title = options.title;
+    uni.setNavigationBarTitle({
+      title: this.title
+    });
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pageA/xiaoxi.js

@@ -215,14 +215,15 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   data: function data() {
     return {};
   },
   methods: {
-    totongzhi: function totongzhi() {
+    totongzhi: function totongzhi(type, title) {
       uni.navigateTo({
-        url: '/pageA/tongzhi'
+        url: '/pageA/tongzhi?type=' + type + '&title=' + title
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -243,6 +243,10 @@ var _default = {
       });
     },
     toindex: function toindex() {
+      if (!this.checked) {
+        this.$u.toast('请勾选协议');
+        return;
+      }
       uni.switchTab({
         url: '/pages/index/index'
       });

unpackage/dist/dev/mp-weixin/pages/mine/mine.js

@@ -326,15 +326,22 @@ exports.default = void 0;
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {};
   },
   onLoad: function onLoad() {},
   methods: {
-    toorder: function toorder() {
+    tologin: function tologin() {
+      uni.reLaunch({
+        url: '/pages/login/login'
+      });
+    },
+    toorder: function toorder(current) {
       uni.navigateTo({
-        url: '/pageA/orderinfo'
+        url: '/pageA/orderinfo?current=' + current
       });
     },
     toduihuan: function toduihuan() {