Bladeren bron

版本更新

liuguofeng 6 maanden geleden
bovenliggende
commit
1e150b329c
26 gewijzigde bestanden met toevoegingen van 198 en 98 verwijderingen
  1. 47 53
      jiaoyu_mp/pages/course/index.vue
  2. 9 3
      jiaoyu_mp/pages/index/index.vue
  3. 4 3
      jiaoyu_mp/pages/product/index.vue
  4. 14 1
      jiaoyu_mp/pages/score/clockin.vue
  5. 1 1
      jiaoyu_mp/pages/score/index.vue
  6. 3 3
      jiaoyu_mp/pages/user/index.vue
  7. 8 3
      jiaoyu_mp/pagesA/course/usercourse.vue
  8. 0 2
      jiaoyu_mp/pagesA/score/index.vue
  9. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/common/assets.js
  10. 44 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.js
  11. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxml
  12. 4 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxss
  13. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  14. 5 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  15. 3 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.wxss
  16. 33 9
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.js
  17. 3 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.json
  18. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.wxml
  19. 1 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.wxss
  20. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/index.wxss
  21. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.js
  22. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/user/index.wxml
  23. 4 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.js
  24. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxml
  25. 5 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxss
  26. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/product.js

+ 47 - 53
jiaoyu_mp/pages/course/index.vue

@@ -1,20 +1,21 @@
 <template>
 	<view class="course_layout">
 		<view class="course_list">
-			<view class="course_item">
+			<view class="course_item" v-for="(item,index) in 2" :key="index">
 				<view class="course_title">
 					<view class="left">
+						<image src="../../static/logo2.jpg"></image>
 					</view>
 					<view class="right">
 						<view class="title">
-							少儿架子鼓进阶课程
+							{{item.course_name}}
 						</view>
 						<view class="skill">
-							进阶难点-技巧点拨
+							{{item.desc}}
 						</view>
 						<view class="course_option">
 							<view class="course_num">
-								总计两个科目
+								课程数量:{{item.course_number}}
 							</view>
 							<view class="course_num">
 								总计10课堂
@@ -22,17 +23,17 @@
 						</view>
 						<view class="course_remain">
 							<view class="remain_class">
-								剩余5堂课
+								预约人数:{{item.reservation_number}}
 							</view>
 							<view class="price">
-								¥100
+								¥{{item.price_total}}
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="btn_title">
 					<view class="title">
-						上课地址:深圳市龙华区民治街道和平路3号
+						上课地址:{{}}
 					</view>
 					<view class="btn">
 						<navigator url="/pagesA/course/reservation">
@@ -48,49 +49,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="course_item">
-				<view class="course_title">
-					<view class="left">
-					</view>
-					<view class="right">
-						<view class="title">
-							少儿架子鼓进阶课程
-						</view>
-						<view class="skill">
-							进阶难点-技巧点拨
-						</view>
-						<view class="course_option">
-							<view class="course_num">
-								总计两个科目
-							</view>
-							<view class="course_num">
-								总计10课堂
-							</view>
-						</view>
-						<view class="course_remain">
-							<view class="remain_class">
-								剩余5堂课
-							</view>
-							<view class="price">
-								¥100
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="btn_title">
-					<view class="title">
-						上课地址:深圳市龙华区民治街道和平路3号
-					</view>
-					<view class="btn">
-						<view class="course_make_btn">
-							预约上课
-						</view>
-						<view class="user_course_btn">
-							我的预约
-						</view>
-					</view>
-				</view>
-			</view>
 		</view>
 		<view class="to_bottom">---到底啦---</view>
 	</view>
@@ -100,9 +58,40 @@
 	export default {
 		data() {
 			return {
-				
+				//产品列表
+				productList:[],
+				// 请求参数
+				requestParam:{
+					name:"",
+					page:1,
+				},
+				// 是否最后一页
+				isLast:false,
+				// 是否请求中
+				isReqing:false,
 			}
 		},
+		onShow() {
+			// 没有数据的话,或者请求中,不允许刷新
+			if( this.isReqing )		return ;
+			// 请求参数
+			this.requestParam.name	= "";
+			// 请求参数
+			this.requestParam.page	= 1;
+			// 是否是最后一页
+			this.isLast			 	= false;
+			// 设置请求中
+			this.isReqing			= true;
+			this.$http.request('api/course/get_list',this.requestParam.page).then((re)=>{
+				// 设置非请求中
+				this.isReqing		= false;
+				// 成功结果
+				if( re.code == 'success' ){
+					if(re.data.last_page <= this.requestParam.page ) this.isLast = true;
+					this.productList = re.data.data;
+				}
+			});
+		},
 		methods: {
 			
 		}
@@ -128,8 +117,13 @@
 				margin: 20rpx auto;
 				.left{
 					width: 240rpx;
-					background-color: aqua;
-					border-radius: 20rpx;
+					// background-color: aqua;
+
+					image{
+						width: 240rpx;
+						height: 240rpx;
+						border-radius: 20rpx;
+					}
 				}
 				.right{
 					font-size: 24rpx;

+ 9 - 3
jiaoyu_mp/pages/index/index.vue

@@ -5,7 +5,7 @@
 			<view class="banner_list" >
 				<swiper class="banner_swiper" :autoplay="true" >
 					<swiper-item v-for="(item,index) in bannerList" :key="index">
-						<image :src="item.thumb" mode="widthFix"  @click="navLottery(item.link_url)"></image>
+						<image :src="item.thumb" class="image" mode="widthFix"  @click="navLottery(item.link_url)"></image>
 					</swiper-item>
 				</swiper>
 			</view>
@@ -58,7 +58,9 @@
 					<text>搜索</text>
 				</view>
 				<uni-icons type="search" size="20" class="icon"></uni-icons>
-				<uni-icons type="notification" size="30" class="search_btn"></uni-icons>
+				<view class="search_btn">
+					<uni-icons type="notification" size="30" ></uni-icons>
+				</view>
 			</navigator>
 		</view>
 		<view class="to_bottom" v-if="isLast"> -----到底啦-----</view>
@@ -255,7 +257,7 @@
 			.search_btn{
 				top: 0rpx;
 				z-index: 9;
-				left: 640rpx;
+				left: 660rpx;
 				color: #FFFFFF;
 				position: absolute;
 				display: block;
@@ -282,6 +284,10 @@
 				display: block;
 				max-width: 680rpx;
 				text-align: center;
+				.image{
+					width: 680rpx;
+					height: 382rpx;
+				}
 			}
 		}
 	}

+ 4 - 3
jiaoyu_mp/pages/product/index.vue

@@ -83,7 +83,7 @@
 				</view>
 			</navigator>
 			<navigator url="/pages/car/index" open-type="switchTab" class="to_car" >
-				<image src="../../static/icon/car.png" class="car_icon" ></image>
+				<image src="../../static/user_icon/user_favo.png" class="car_icon" ></image>
 				<view class="text">
 					收藏
 				</view>
@@ -937,7 +937,8 @@
 				}
 				.icon{
 					float: right;
-					font-size: 30rpx;
+					font-size: 35rpx;
+					font-weight: bold;
 					color: #999999;
 				}
 			}
@@ -1105,7 +1106,7 @@
 			}
 			.text{
 				float: left;
-				padding-left: 5rpx;
+				padding-left: 6rpx;
 				font-size: 24rpx;
 			}
 		}

+ 14 - 1
jiaoyu_mp/pages/score/clockin.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="main_view">
-			<view class="status_bar" :style="status_bar_style"><!-- 这里是状态栏 --></view>
+			<view class="status_bar" @click="goBack" :style="status_bar_style"> <uni-icons type="left" size="25"></uni-icons><!-- 这里是状态栏 --></view>
 			<view class="info_box">
 				<view class="left_box">
 					<view class="finish_box">
@@ -132,6 +132,18 @@
 						this.isMark 	= re.data.is_mark;
 					}
 				});
+			},
+			goBack(){
+				uni.navigateBack({
+					success: () => {
+						
+					},
+					fail: (err) => {
+						uni.reLaunch({
+							url:"/pages/index/index"
+						})
+					}
+				});
 			}
 		}
 	}
@@ -150,6 +162,7 @@
 			height: 64rpx;
 			display: block;
 			padding-top: var(--status-bar-height);
+			margin-left: 20rpx;
 		}
 		.info_box{
 			display: block;

+ 1 - 1
jiaoyu_mp/pages/score/index.vue

@@ -360,7 +360,7 @@
 					position: absolute;
 					width: 90rpx;
 					left: 0rpx;
-					top: 10rpx;
+					top: 15rpx;
 					text-align: center;
 				}
 			}

+ 3 - 3
jiaoyu_mp/pages/user/index.vue

@@ -62,19 +62,19 @@
 					</view>
 					<view class="navigator_title">课程表</view>
 				</navigator>
-				<navigator class="navigator_item" url="/pages/orders/index" >
+				<navigator class="navigator_item" url=" " >
 					<view class="navigator_image_score">
 						<image class="navigator_image" src="../../static/user_icon/user_score_icon.png" mode=""></image>
 					</view>
 					<view class="navigator_title">积分订单</view>
 				</navigator>
-				<navigator class="navigator_item" url="/pages/orders/index" >
+				<navigator class="navigator_item" url="/pages/addr/index" >
 					<view class="navigator_image_attr">
 						<image class="navigator_image" src="../../static/user_icon/user_attr_icon.png" mode=""></image>
 					</view>
 					<view class="navigator_title">收货地址</view>
 				</navigator>
-				<navigator class="navigator_item" url="/pages/orders/index" >
+				<navigator class="navigator_item" url="/pagesA/user/usercoupon" >
 					<view class="navigator_image_coupon">
 						<image class="navigator_image" src="../../static/user_icon/user_coupon_icon.png" mode=""></image>
 					</view>

+ 8 - 3
jiaoyu_mp/pagesA/course/usercourse.vue

@@ -2,7 +2,7 @@
 	<view >
 		<view class="course_status_list">
 			<view class="course_status_item" > 全部 </view>
-			<view class="course_status_item" > 上课 </view>
+			<view class="course_status_item" > 上课 </view>
 			<view class="course_status_item" > 已完成 </view>
 			<view class="course_status_item" > 已取消 </view>
 		</view>
@@ -10,7 +10,7 @@
 			<view class="course_item">
 				<view class="course_title">
 					<view class="course_prc">
-						
+						<image src="../../static/logo2.jpg" mode=""></image>
 					</view>
 					<view class="title">
 						<view class="title_text">
@@ -205,7 +205,12 @@
 				display: flex;
 				.course_prc{
 					width: 164rpx;
-					background-color: aqua;
+					// background-color: aqua;
+					image{
+						width: 164rpx;
+						height: 164rpx;
+						border-radius: 20rpx;
+					}
 				}
 				.title{
 					flex: 1;

+ 0 - 2
jiaoyu_mp/pagesA/score/index.vue

@@ -54,9 +54,7 @@
 					积分
 				</view>
 			</view>
-
 		</view>
-		
 		<view class="to_bottom" > -----到底了-----</view>
 	</view>
 </template>

+ 2 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/common/assets.js

@@ -8,10 +8,10 @@ const _imports_4 = "/static/user_icon/user_attr_icon.png";
 const _imports_5 = "/static/user_icon/user_coupon_icon.png";
 const _imports_6 = "/static/user_icon/user_clockin_icon.png";
 const _imports_0$2 = "/static/tabbar/score.png";
-const _imports_1$1 = "/static/icon/car.png";
+const _imports_1$1 = "/static/user_icon/user_favo.png";
 const _imports_0$1 = "/static/logo2.jpg";
 const _imports_0 = "/static/icon/score.png";
-const _imports_1 = "/static/user_icon/user_favo.png";
+const _imports_1 = "/static/icon/car.png";
 exports._imports_0 = _imports_0$2;
 exports._imports_0$1 = _imports_0$1;
 exports._imports_0$2 = _imports_0;

+ 44 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.js

@@ -1,13 +1,55 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
-    return {};
+    return {
+      //产品列表
+      productList: [],
+      // 请求参数
+      requestParam: {
+        name: "",
+        page: 1
+      },
+      // 是否最后一页
+      isLast: false,
+      // 是否请求中
+      isReqing: false
+    };
+  },
+  onShow() {
+    if (this.isReqing)
+      return;
+    this.requestParam.name = "";
+    this.requestParam.page = 1;
+    this.isLast = false;
+    this.isReqing = true;
+    this.$http.request("api/course/get_list", this.requestParam.page).then((re) => {
+      this.isReqing = false;
+      if (re.code == "success") {
+        if (re.data.last_page <= this.requestParam.page)
+          this.isLast = true;
+        this.productList = re.data.data;
+      }
+    });
   },
   methods: {}
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {};
+  return {
+    a: common_vendor.f(2, (item, index, i0) => {
+      return {
+        a: common_vendor.t(item.course_name),
+        b: common_vendor.t(item.desc),
+        c: common_vendor.t(item.course_number),
+        d: common_vendor.t(item.reservation_number),
+        e: common_vendor.t(item.price_total),
+        f: index
+      };
+    }),
+    b: common_assets._imports_0$1,
+    c: common_vendor.t()
+  };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxml

@@ -1 +1 @@
-<view class="course_layout"><view class="course_list"><view class="course_item"><view class="course_title"><view class="left"></view><view class="right"><view class="title"> 少儿架子鼓进阶课程 </view><view class="skill"> 进阶难点-技巧点拨 </view><view class="course_option"><view class="course_num"> 总计两个科目 </view><view class="course_num"> 总计10课堂 </view></view><view class="course_remain"><view class="remain_class"> 剩余5堂课 </view><view class="price"> ¥100 </view></view></view></view><view class="btn_title"><view class="title"> 上课地址:深圳市龙华区民治街道和平路3号 </view><view class="btn"><navigator url="/pagesA/course/reservation"><view class="course_make_btn"> 预约上课 </view></navigator><navigator url="/pagesA/course/usercourse"><view class="user_course_btn"> 我的预约 </view></navigator></view></view></view><view class="course_item"><view class="course_title"><view class="left"></view><view class="right"><view class="title"> 少儿架子鼓进阶课程 </view><view class="skill"> 进阶难点-技巧点拨 </view><view class="course_option"><view class="course_num"> 总计两个科目 </view><view class="course_num"> 总计10课堂 </view></view><view class="course_remain"><view class="remain_class"> 剩余5堂课 </view><view class="price"> ¥100 </view></view></view></view><view class="btn_title"><view class="title"> 上课地址:深圳市龙华区民治街道和平路3号 </view><view class="btn"><view class="course_make_btn"> 预约上课 </view><view class="user_course_btn"> 我的预约 </view></view></view></view></view><view class="to_bottom">---到底啦---</view></view>
+<view class="course_layout"><view class="course_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="f" class="course_item"><view class="course_title"><view class="left"><image src="{{b}}"></image></view><view class="right"><view class="title">{{item.a}}</view><view class="skill">{{item.b}}</view><view class="course_option"><view class="course_num"> 课程数量:{{item.c}}</view><view class="course_num"> 总计10课堂 </view></view><view class="course_remain"><view class="remain_class"> 预约人数:{{item.d}}</view><view class="price"> ¥{{item.e}}</view></view></view></view><view class="btn_title"><view class="title"> 上课地址:{{c}}</view><view class="btn"><navigator url="/pagesA/course/reservation"><view class="course_make_btn"> 预约上课 </view></navigator><navigator url="/pagesA/course/usercourse"><view class="user_course_btn"> 我的预约 </view></navigator></view></view></view></view><view class="to_bottom">---到底啦---</view></view>

+ 4 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/course/index.wxss

@@ -20,7 +20,10 @@
 }
 .course_layout .course_list .course_item .course_title .left {
   width: 240rpx;
-  background-color: aqua;
+}
+.course_layout .course_list .course_item .course_title .left image {
+  width: 240rpx;
+  height: 240rpx;
   border-radius: 20rpx;
 }
 .course_layout .course_list .course_item .course_title .right {

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{item.a}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>{{item.b}}</text></view><view class="time"><text>距今日结束08:02:56</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">¥</label><text>{{item.c}}</text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><navigator url="/pagesA/search/index" class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><uni-icons wx:if="{{e}}" class="search_btn" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></navigator></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>
+<view><view class="banner_box"><view class="banner_list"><swiper class="banner_swiper" autoplay="{{true}}"><swiper-item wx:for="{{a}}" wx:for-item="item" wx:key="c"><image src="{{item.a}}" class="image" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view><view class="product_box"><view wx:if="{{b}}" class="to_bottom"> -----还没有产品啦-----</view><view class="product_list"><view wx:for="{{c}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{item.a}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>{{item.b}}</text></view><view class="time"><text>距今日结束08:02:56</text></view></view><view class="stock_price"><view class="product_price"><label style="font-size:26rpx">¥</label><text>{{item.c}}</text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><navigator url="/pagesA/search/index" class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="406c9705-0" bind:__l="__l" u-p="{{d}}"></uni-icons><view class="search_btn"><uni-icons wx:if="{{e}}" u-i="406c9705-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></navigator></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>

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

@@ -44,7 +44,7 @@
 .search_fixed .search_box .search_btn {
   top: 0rpx;
   z-index: 9;
-  left: 640rpx;
+  left: 660rpx;
   color: #FFFFFF;
   position: absolute;
   display: block;
@@ -72,6 +72,10 @@
   max-width: 680rpx;
   text-align: center;
 }
+.banner_box .banner_list .banner_swiper .image {
+  width: 680rpx;
+  height: 382rpx;
+}
 .product_box {
   display: block;
   overflow: hidden;

+ 3 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.wxss

@@ -86,7 +86,8 @@
 }
 .product_info .product_coupon .coupon_info .icon {
   float: right;
-  font-size: 30rpx;
+  font-size: 35rpx;
+  font-weight: bold;
   color: #999999;
 }
 .product_business {
@@ -230,7 +231,7 @@
 }
 .order_car .to_car .text {
   float: left;
-  padding-left: 5rpx;
+  padding-left: 6rpx;
   font-size: 24rpx;
 }
 .popup {

+ 33 - 9
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.js

@@ -64,17 +64,41 @@ const _sfc_main = {
           this.isMark = re.data.is_mark;
         }
       });
+    },
+    goBack() {
+      common_vendor.index.navigateBack({
+        success: () => {
+        },
+        fail: (err) => {
+          common_vendor.index.reLaunch({
+            url: "/pages/index/index"
+          });
+        }
+      });
     }
   }
 };
+if (!Array) {
+  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
+  _easycom_uni_icons2();
+}
+const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js";
+if (!Math) {
+  _easycom_uni_icons();
+}
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.s($data.status_bar_style),
-    b: common_vendor.t($data.isMark.finish_day),
-    c: common_vendor.t($data.scoreInfo.score),
-    d: common_vendor.t($data.scoreInfo.wait_score),
-    e: common_assets._imports_0$2,
-    f: common_vendor.f($data.clockinList, (item, index, i0) => {
+    a: common_vendor.p({
+      type: "left",
+      size: "25"
+    }),
+    b: common_vendor.o((...args) => $options.goBack && $options.goBack(...args)),
+    c: common_vendor.s($data.status_bar_style),
+    d: common_vendor.t($data.isMark.finish_day),
+    e: common_vendor.t($data.scoreInfo.score),
+    f: common_vendor.t($data.scoreInfo.wait_score),
+    g: common_assets._imports_0$2,
+    h: common_vendor.f($data.clockinList, (item, index, i0) => {
       return common_vendor.e({
         a: common_vendor.t(item.what_day),
         b: index == 0 || index == 1 || index == 3 || index == 5
@@ -97,9 +121,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         m: index
       });
     }),
-    g: common_vendor.t($data.isMark.is_clockin ? "已签到" : "签到"),
-    h: common_vendor.n($data.isMark.is_clockin ? "active" : ""),
-    i: common_vendor.o(($event) => $options.toClockin())
+    i: common_vendor.t($data.isMark.is_clockin ? "已签到" : "签到"),
+    j: common_vendor.n($data.isMark.is_clockin ? "active" : ""),
+    k: common_vendor.o(($event) => $options.toClockin())
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

+ 3 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "积分签到",
   "navigationStyle": "custom",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-icons": "../../uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
 }

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.wxml

@@ -1 +1 @@
-<view><view class="main_view"><view class="status_bar" style="{{a}}"></view><view class="info_box"><view class="left_box"><view class="finish_box"><view class="finish_title">连续签到天数</view><view class="finish_day">{{b}}</view></view><view class="score_box"><view class="score_title"><text class="title_item">当前积分</text><text class="title_item">待入账积分</text></view><view class="score"><text class="score_item">{{c}}</text><text class="score_item">{{d}}</text></view></view></view><view class="right_box"><image class="score_icon" src="{{e}}" mode=""></image></view></view><view class="clockin_box"><view class="box_title">连续签到奖励更丰厚</view><view class="clockin_list"><view wx:for="{{f}}" wx:for-item="item" wx:key="m" class="{{['clockin_item', item.l]}}"><view class="what_day">第{{item.a}}天</view><view wx:if="{{item.b}}" class="score_one"><image class="score_icon" src="{{item.c}}" mode=""></image></view><view wx:if="{{item.d}}" class="score_tow"><image class="score_icon" src="{{item.e}}" mode=""></image><image class="score_icon" src="{{item.f}}" mode=""></image></view><view wx:if="{{item.g}}" class="score_the"><image class="score_icon" src="{{item.h}}" mode=""></image><image class="score_icon" src="{{item.i}}" mode=""></image><image class="score_icon" src="{{item.j}}" mode=""></image></view><view class="give_score">+{{item.k}}</view></view></view><button class="{{['clockin_btn', h]}}" bindtap="{{i}}">{{g}}</button><navigator url="/pages/score/record" class="score_record">积分记录 ></navigator></view></view></view>
+<view><view class="main_view"><view class="status_bar" bindtap="{{b}}" style="{{c}}"><uni-icons wx:if="{{a}}" u-i="68b82334-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view class="info_box"><view class="left_box"><view class="finish_box"><view class="finish_title">连续签到天数</view><view class="finish_day">{{d}}</view></view><view class="score_box"><view class="score_title"><text class="title_item">当前积分</text><text class="title_item">待入账积分</text></view><view class="score"><text class="score_item">{{e}}</text><text class="score_item">{{f}}</text></view></view></view><view class="right_box"><image class="score_icon" src="{{g}}" mode=""></image></view></view><view class="clockin_box"><view class="box_title">连续签到奖励更丰厚</view><view class="clockin_list"><view wx:for="{{h}}" wx:for-item="item" wx:key="m" class="{{['clockin_item', item.l]}}"><view class="what_day">第{{item.a}}天</view><view wx:if="{{item.b}}" class="score_one"><image class="score_icon" src="{{item.c}}" mode=""></image></view><view wx:if="{{item.d}}" class="score_tow"><image class="score_icon" src="{{item.e}}" mode=""></image><image class="score_icon" src="{{item.f}}" mode=""></image></view><view wx:if="{{item.g}}" class="score_the"><image class="score_icon" src="{{item.h}}" mode=""></image><image class="score_icon" src="{{item.i}}" mode=""></image><image class="score_icon" src="{{item.j}}" mode=""></image></view><view class="give_score">+{{item.k}}</view></view></view><button class="{{['clockin_btn', j]}}" bindtap="{{k}}">{{i}}</button><navigator url="/pages/score/record" class="score_record">积分记录 ></navigator></view></view></view>

+ 1 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/clockin.wxss

@@ -11,6 +11,7 @@ page {
   height: 64rpx;
   display: block;
   padding-top: var(--status-bar-height);
+  margin-left: 20rpx;
 }
 .main_view .info_box {
   display: block;

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/index.wxss

@@ -44,7 +44,7 @@
   position: absolute;
   width: 90rpx;
   left: 0rpx;
-  top: 10rpx;
+  top: 15rpx;
   text-align: center;
 }
 .header_fixed .course_option {

+ 2 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.js

@@ -191,8 +191,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     e: $data.productInfo.thumb,
     f: common_vendor.t($data.productInfo.stock),
     g: common_assets._imports_0,
-    h: common_assets._imports_1$2,
-    i: common_assets._imports_1$1,
+    h: common_assets._imports_1$1,
+    i: common_assets._imports_1$2,
     j: common_vendor.o(($event) => $options.showSpecPopup(2)),
     k: !$data.checkedAddr.id
   }, !$data.checkedAddr.id ? {} : {}, {

File diff suppressed because it is too large
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/user/index.wxml


+ 4 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.js

@@ -1,5 +1,6 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
     return {};
@@ -22,10 +23,11 @@ if (!Math) {
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_vendor.o(($event) => $options.cancelPopup()),
+    a: common_assets._imports_0$1,
     b: common_vendor.o(($event) => $options.cancelPopup()),
     c: common_vendor.o(($event) => $options.cancelPopup()),
-    d: common_vendor.sr("cancelPopup", "110bae46-0")
+    d: common_vendor.o(($event) => $options.cancelPopup()),
+    e: common_vendor.sr("cancelPopup", "110bae46-0")
   };
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

File diff suppressed because it is too large
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxml


+ 5 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxss

@@ -27,7 +27,11 @@
 }
 .course_list .course_item .course_title .course_prc {
   width: 164rpx;
-  background-color: aqua;
+}
+.course_list .course_item .course_title .course_prc image {
+  width: 164rpx;
+  height: 164rpx;
+  border-radius: 20rpx;
 }
 .course_list .course_item .course_title .title {
   flex: 1;

+ 2 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/product.js

@@ -191,8 +191,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     e: $data.productInfo.thumb,
     f: common_vendor.t($data.productInfo.stock),
     g: common_assets._imports_0,
-    h: common_assets._imports_1$1,
-    i: common_assets._imports_1$1,
+    h: common_assets._imports_1$2,
+    i: common_assets._imports_1$2,
     j: common_vendor.o(($event) => $options.showSpecPopup(2)),
     k: !$data.checkedAddr.id
   }, !$data.checkedAddr.id ? {} : {}, {

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