合并

pages/my/Kudos/Kudos.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="kudos">
+		<!-- 点赞列表 -->
 		<view class="List">
 			<view class="ListItem" v-for="item in 6" @click="goVoteDetail">
 				<image src="/static/icon/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
@@ -22,6 +23,7 @@
 				</view>
 			</view>
 		</view>
+		<!-- 已经到底啦 -->
 		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
 	</view>
 </template>
@@ -30,7 +32,9 @@
 	export default{
 		data(){
 			return{
+				// 点赞状态
 				isLike:false,
+				//组件uni-load-more
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',

pages/my/myorders/orders.vue

@@ -172,8 +172,10 @@
 				</view>
 			</view>
 		</view>
-
+		
+		<!-- 已经到底啦 -->
 		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
+		
 		<!-- 弹出层 -->
 		<uni-popup ref="popup" type="center">
 			<view class="pop">
@@ -188,6 +190,7 @@
 				</view>
 			</view>
 		</uni-popup>
+		
 	</view>
 </template>
 
@@ -195,9 +198,10 @@
 	export default {
 		data() {
 			return {
+				// 分段器标题
 				items: ['全部', '待兑换', '待发货', '待收货', '已完成'],
 				isActive: 0,
-				current: 0,
+				// 组件uni-load-more
 				status: 'noMore',
 				contentText: {
 					contentdown: '查看更多',
@@ -217,11 +221,7 @@
 			checked(index) {
 				this.isActive = index
 			},
-			onClickItem(e) {
-				if (this.current != e.currentIndex) {
-					this.current = e.currentIndex;
-				}
-			},
+			
 			// 跳转订单详情
 			goOrderDetail() {
 				uni.navigateTo({
@@ -234,9 +234,11 @@
 					url: '/pages/my/integral/integralOrder'
 				})
 			},
+			// 打开弹出层
 			openVFcode() {
 				this.$refs.popup.open()
 			},
+			// 关闭弹出层
 			closeVFcode() {
 				this.$refs.popup.close()
 			},

pages/my/prize/prize.vue

@@ -13,8 +13,6 @@
 			</view>
 		</view>
 
-
-
 		<view style="margin-bottom: 60rpx; ">
 			<!-- 实物奖品 -->
 			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="isActive == 0">

unpackage/dist/dev/mp-weixin/pages/my/Kudos/Kudos.js

@@ -183,11 +183,15 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {
     return {
+      // 点赞状态
       isLike: false,
+      //组件uni-load-more
       status: 'noMore',
       contentText: {
         contentdown: '查看更多',

unpackage/dist/dev/mp-weixin/pages/my/myorders/orders.js

@@ -357,13 +357,17 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
 var _default =
 {
   data: function data() {
     return {
+      // 分段器标题
       items: ['全部', '待兑换', '待发货', '待收货', '已完成'],
       isActive: 0,
-      current: 0,
+      // 组件uni-load-more
       status: 'noMore',
       contentText: {
         contentdown: '查看更多',
@@ -383,11 +387,7 @@ var _default =
     checked: function checked(index) {
       this.isActive = index;
     },
-    onClickItem: function onClickItem(e) {
-      if (this.current != e.currentIndex) {
-        this.current = e.currentIndex;
-      }
-    },
+
     // 跳转订单详情
     goOrderDetail: function goOrderDetail() {
       uni.navigateTo({
@@ -400,9 +400,11 @@ var _default =
         url: '/pages/my/integral/integralOrder' });
 
     },
+    // 打开弹出层
     openVFcode: function openVFcode() {
       this.$refs.popup.open();
     },
+    // 关闭弹出层
     closeVFcode: function closeVFcode() {
       this.$refs.popup.close();
     },

unpackage/dist/dev/mp-weixin/pages/my/prize/prize.js

@@ -217,8 +217,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
 var _default =
 {
   data: function data() {