瀏覽代碼

用户页面更新

liuguofeng 7 月之前
父節點
當前提交
5791b3b9a6
共有 26 個文件被更改,包括 187 次插入50 次删除
  1. 99 12
      jiaoyu_mp/pagesA/orders/userorder.vue
  2. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/addr/index.js
  3. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/addr/index.wxml
  4. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/car/order.js
  5. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/car/order.wxml
  6. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  7. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/orders/completion.wxml
  8. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/orders/index.js
  9. 4 4
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.js
  10. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.wxml
  11. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.js
  12. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.wxml
  13. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/reservation.js
  14. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/reservation.wxml
  15. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.js
  16. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxml
  17. 21 6
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.js
  18. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxml
  19. 42 7
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxss
  20. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/index.wxml
  21. 2 2
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/product.js
  22. 0 0
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/product.wxml
  23. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/search/index.wxml
  24. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/project.config.json
  25. 3 3
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/project.private.config.json
  26. 1 1
      jiaoyu_mp/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml

+ 99 - 12
jiaoyu_mp/pagesA/orders/userorder.vue

@@ -32,7 +32,58 @@
 						</view>
 					</view>
 				</view>
-
+				<view class="more_title">
+					<view class="more">
+						去上课
+					</view>
+					<view class="more">
+						去评价
+					</view>
+					<view class="more">
+						更多
+					</view>
+				</view>
+			</view>
+			<view class="order_item">
+				<view class="product_title_status">
+					<view class="title">
+						少年栏目cctv
+					</view>
+					<view class="status">
+						订单已完成
+					</view>
+				</view>
+				<view class="product_info">
+					<view  class="product_image">
+						<image src="../../static/logo2.jpg" mode=""></image>
+					</view>
+					<view class="product_title_price">
+						<view class="title">
+							少儿直播学习课堂,今日限购世世事实
+						</view>
+						<view class="price">
+							¥100
+						</view>
+						<view class="actual_pay">
+							实付100
+						</view>
+					</view>
+				</view>
+				<view class="more_title">
+					<view class="more">
+						去上课
+					</view>
+					<view class="more">
+						去评价
+					</view>
+					<view class="more">
+						  <view @click="showMoreOptions = true">更多</view>
+						  <view v-if="showMoreOptions" class="more-options">
+						    <view @click="deleteOrder">删除订单</view>
+						    <view @click="showOrderDetails">订单详情</view>
+						  </view>
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -42,11 +93,18 @@
 	export default {
 		data() {
 			return {
-				
+				showMoreOptions:false
 			}
 		},
 		methods: {
-			
+		  deleteOrder() {
+		    // 处理删除订单的逻辑
+		    this.showMoreOptions = false;
+		  },
+		  showOrderDetails() {
+		    // 处理显示订单详情的逻辑
+		    this.showMoreOptions = false;
+		  }
 		}
 	}
 </script>
@@ -71,10 +129,8 @@
 	}
 	.order_list{
 		width: 750rpx;
-		height: 750rpx;
 		.order_item{
 			width: 690rpx;
-			height: 500rpx;
 			margin: 30rpx auto;
 			background-color: #FFFFFF;
 			padding-top: 1rpx;
@@ -83,25 +139,56 @@
 				justify-content: space-between;
 				margin: 20rpx 20rpx;
 				.title{
-					
+					font-size: 30rpx;
+					color: #000000;
 				}
 				.status{
-					
+					font-size: 24rpx;
 				}
 			}
 			.product_info{
 				margin-left: 20rpx;
 				display: flex;
 				.product_image{
-					width: 100rpx;
-					height: 100rpx;
+					width: 180rpx;
 					image{
-						width: 100rpx;
-						height: 100rpx;
+						width: 180rpx;
+						height: 160rpx;
+						border-radius: 40rpx;
 					}
 				}
 				.product_title_price{
-					margin-left: 20rpx;
+					margin: 0rpx 20rpx;
+					.title{
+						font-size: 34rpx;
+					}
+					.price{
+						font-size: 24rpx;
+						color: red;
+					}
+					.actual_pay{
+						text-align: right;
+						padding-right: 20rpx;
+						font-size: 24rpx;
+					}
+				}
+			}
+			.more_title{
+				width: 690rpx;
+				display: flex;
+				justify-content: flex-end;
+				.more{
+					padding: 20rpx;
+					 position: relative;
+					.more-options {
+					    position: absolute;
+						width: 150rpx;
+					    right: 0;
+					    top: 70rpx; 
+					    background-color: #333;
+						line-height: 1.5;
+					    border: 1px solid #333;
+					  }
 				}
 			}
 		}

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

@@ -237,7 +237,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     t: common_vendor.o((...args) => $options.defaultSwitch && $options.defaultSwitch(...args)),
     v: $data.addrRequest.is_default ? true : false,
     w: common_vendor.o((...args) => $options.saveAddr && $options.saveAddr(...args)),
-    x: common_vendor.sr("addrForm", "736fdcec-0"),
+    x: common_vendor.sr("addrForm", "217e1134-0"),
     y: common_vendor.o($options.popupChange),
     z: common_vendor.p({
       type: "bottom",

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/addr/index.wxml


+ 2 - 2
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/car/order.js

@@ -294,7 +294,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         s: common_vendor.o(($event) => $options.checkedCoupon(index), index)
       });
     }),
-    p: common_vendor.sr("popup", "501c76ed-0"),
+    p: common_vendor.sr("popup", "309a4bfa-0"),
     q: common_vendor.o(() => {
     }),
     r: common_vendor.p({
@@ -316,7 +316,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: common_vendor.o(($event) => $options.checkedAddrItem(item), index)
       });
     }),
-    t: common_vendor.sr("addrPopup", "501c76ed-1"),
+    t: common_vendor.sr("addrPopup", "309a4bfa-1"),
     v: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/car/order.wxml


+ 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="b" bindtap="{{item.a}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{''}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>少儿直播学习课堂,今日限购</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>100 </text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><view class="search_box"><view class="search_input"><text>搜索</text></view><uni-icons wx:if="{{d}}" class="icon" u-i="34e2a16f-0" bind:__l="__l" u-p="{{d}}"></uni-icons><uni-icons wx:if="{{e}}" class="search_btn" u-i="34e2a16f-1" bind:__l="__l" u-p="{{e}}"></uni-icons></view></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}}" 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="b" bindtap="{{item.a}}" data-eventsync="true" class="product_item"><view class="product_left"><image class="product_image" src="{{''}}" mode=""></image></view><view class="product_right"><view class="product_title"><view class="product_text"><text>少儿直播学习课堂,今日限购</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>100 </text></view><view class="product_order_but"><button>立即购买</button></view></view></view></view></view></view><view class="search_fixed"><view 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></view></view><view wx:if="{{f}}" class="to_bottom"> -----到底啦-----</view></view>

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

@@ -1 +1 @@
-<view class="order_completion_box"><view class="order_completion_title"><view class="completion_icon"><uni-icons wx:if="{{a}}" class="icon" u-i="75aa0760-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view wx:for="{{b}}" wx:for-item="item" wx:key="d" class="product_title">{{item.a}} {{item.b}} 特惠价 ¥{{item.c}}</view></view><view class="nav_button"><view class="nav_order" bindtap="{{c}}"><text>查看订单</text></view><view class="nav_home" bindtap="{{d}}"><text>返回首页</text></view></view><view wx:if="{{e}}" class="lotteryinfo"><view class="lottery_title">恭喜您预约成功,诚邀您参与以下活动</view><view class="banner"><swiper class="swiper" autoplay="{{true}}"><swiper-item wx:for="{{f}}" wx:for-item="item" wx:key="c"><image class="swiper_item_img" src="{{item.a}}" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view></view>
+<view class="order_completion_box"><view class="order_completion_title"><view class="completion_icon"><uni-icons wx:if="{{a}}" class="icon" u-i="4c0ef476-0" bind:__l="__l" u-p="{{a}}"></uni-icons></view><view wx:for="{{b}}" wx:for-item="item" wx:key="d" class="product_title">{{item.a}} {{item.b}} 特惠价 ¥{{item.c}}</view></view><view class="nav_button"><view class="nav_order" bindtap="{{c}}"><text>查看订单</text></view><view class="nav_home" bindtap="{{d}}"><text>返回首页</text></view></view><view wx:if="{{e}}" class="lotteryinfo"><view class="lottery_title">恭喜您预约成功,诚邀您参与以下活动</view><view class="banner"><swiper class="swiper" autoplay="{{true}}"><swiper-item wx:for="{{f}}" wx:for-item="item" wx:key="c"><image class="swiper_item_img" src="{{item.a}}" mode="widthFix" bindtap="{{item.b}}"></image></swiper-item></swiper></view></view></view>

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

@@ -143,7 +143,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: common_vendor.n(item.contents_class ? "active" : ""),
         f: item.product_list.length > 1
       }, item.product_list.length > 1 ? {
-        g: "135c8004-0-" + i0,
+        g: "5c067d28-0-" + i0,
         h: common_vendor.p({
           type: item.contents_class ? "up" : "down",
           size: "20"

+ 4 - 4
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.js

@@ -562,7 +562,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, $data.specBtnType == 2 ? {
     Q: common_vendor.o(($event) => $options.createCart())
   } : {}, {
-    R: common_vendor.sr("specPopup", "10a48ccc-1"),
+    R: common_vendor.sr("specPopup", "618774e2-1"),
     S: common_vendor.o($options.popupChange),
     T: common_vendor.p({
       show: true,
@@ -607,7 +607,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         s: index
       });
     }),
-    V: common_vendor.sr("couponPopup", "10a48ccc-2"),
+    V: common_vendor.sr("couponPopup", "618774e2-2"),
     W: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"
@@ -627,7 +627,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: common_vendor.o(($event) => $options.checkedAddrItem(item), index)
       });
     }),
-    Y: common_vendor.sr("addrPopup", "10a48ccc-3"),
+    Y: common_vendor.sr("addrPopup", "618774e2-3"),
     Z: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"
@@ -638,7 +638,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ac: $data.followQrcode
   } : {}, {
     ad: common_vendor.o(($event) => $options.saveImage()),
-    ae: common_vendor.sr("addFollow", "10a48ccc-4"),
+    ae: common_vendor.sr("addFollow", "618774e2-4"),
     af: common_vendor.o($options.popupChange),
     ag: common_vendor.p({
       type: "center"

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/product/index.wxml


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

@@ -190,7 +190,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     B: common_vendor.t($data.productInfo.stock),
     C: common_vendor.t($data.priceTotal),
     D: common_vendor.o(($event) => $options.createOrder()),
-    E: common_vendor.sr("specPopup", "330db78c-0"),
+    E: common_vendor.sr("specPopup", "f81ec0bc-0"),
     F: common_vendor.o($options.popupChange),
     G: common_vendor.p({
       show: true,
@@ -212,7 +212,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: common_vendor.o(($event) => $options.checkedAddrItem(item), index)
       });
     }),
-    I: common_vendor.sr("addrPopup", "330db78c-1"),
+    I: common_vendor.sr("addrPopup", "f81ec0bc-1"),
     J: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pages/score/product.wxml


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

@@ -59,11 +59,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       };
     }),
     g: common_vendor.o(($event) => $options.outcomePopup()),
-    h: common_vendor.sr("popup", "0ba8330f-0"),
+    h: common_vendor.sr("popup", "46f39ab6-0"),
     i: common_vendor.p({
       ["safe-area"]: false
     }),
-    j: common_vendor.sr("outcomePopup", "0ba8330f-1"),
+    j: common_vendor.sr("outcomePopup", "46f39ab6-1"),
     k: common_vendor.o(($event) => $options.reservationPopup())
   };
 }

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/reservation.wxml


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

@@ -25,7 +25,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     a: common_vendor.o(($event) => $options.cancelPopup()),
     b: common_vendor.o(($event) => $options.cancelPopup()),
     c: common_vendor.o(($event) => $options.cancelPopup()),
-    d: common_vendor.sr("cancelPopup", "01417333-0"),
+    d: common_vendor.sr("cancelPopup", "110bae46-0"),
     e: common_vendor.p({
       type: "top"
     })

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/course/usercourse.wxml


+ 21 - 6
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.js

@@ -1,16 +1,31 @@
 "use strict";
-const common_assets = require("../../common/assets.js");
 const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
 const _sfc_main = {
   data() {
-    return {};
+    return {
+      showMoreOptions: false
+    };
   },
-  methods: {}
+  methods: {
+    deleteOrder() {
+      this.showMoreOptions = false;
+    },
+    showOrderDetails() {
+      this.showMoreOptions = false;
+    }
+  }
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return {
-    a: common_assets._imports_0$2
-  };
+  return common_vendor.e({
+    a: common_assets._imports_0$2,
+    b: common_assets._imports_0$2,
+    c: common_vendor.o(($event) => $data.showMoreOptions = true),
+    d: $data.showMoreOptions
+  }, $data.showMoreOptions ? {
+    e: common_vendor.o((...args) => $options.deleteOrder && $options.deleteOrder(...args)),
+    f: common_vendor.o((...args) => $options.showOrderDetails && $options.showOrderDetails(...args))
+  } : {});
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxml

@@ -1 +1 @@
-<view><view class="order_status_list"><view class="order_status_item"> 全部订单 </view><view class="order_status_item"> 进行中 </view><view class="order_status_item"> 已完成 </view><view class="order_status_item"> 售后 </view></view><view class="order_list"><view class="order_item"><view class="product_title_status"><view class="title"> 少年栏目cctv </view><view class="status"> 订单已完成 </view></view><view class="product_info"><view class="product_image"><image src="{{a}}" mode=""></image></view><view class="product_title_price"><view class="title"> 少儿直播学习课堂,今日限购世世事实 </view><view class="price"> ¥100 </view><view class="actual_pay"> 实付100 </view></view></view></view></view></view>
+<view><view class="order_status_list"><view class="order_status_item"> 全部订单 </view><view class="order_status_item"> 进行中 </view><view class="order_status_item"> 已完成 </view><view class="order_status_item"> 售后 </view></view><view class="order_list"><view class="order_item"><view class="product_title_status"><view class="title"> 少年栏目cctv </view><view class="status"> 订单已完成 </view></view><view class="product_info"><view class="product_image"><image src="{{a}}" mode=""></image></view><view class="product_title_price"><view class="title"> 少儿直播学习课堂,今日限购世世事实 </view><view class="price"> ¥100 </view><view class="actual_pay"> 实付100 </view></view></view><view class="more_title"><view class="more"> 去上课 </view><view class="more"> 去评价 </view><view class="more"> 更多 </view></view></view><view class="order_item"><view class="product_title_status"><view class="title"> 少年栏目cctv </view><view class="status"> 订单已完成 </view></view><view class="product_info"><view class="product_image"><image src="{{b}}" mode=""></image></view><view class="product_title_price"><view class="title"> 少儿直播学习课堂,今日限购世世事实 </view><view class="price"> ¥100 </view><view class="actual_pay"> 实付100 </view></view></view><view class="more_title"><view class="more"> 去上课 </view><view class="more"> 去评价 </view><view class="more"><view bindtap="{{c}}">更多</view><view wx:if="{{d}}" class="more-options"><view bindtap="{{e}}">删除订单</view><view bindtap="{{f}}">订单详情</view></view></view></view></view></view></view>

+ 42 - 7
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/orders/userorder.wxss

@@ -17,11 +17,9 @@
 }
 .order_list {
   width: 750rpx;
-  height: 750rpx;
 }
 .order_list .order_item {
   width: 690rpx;
-  height: 500rpx;
   margin: 30rpx auto;
   background-color: #FFFFFF;
   padding-top: 1rpx;
@@ -31,18 +29,55 @@
   justify-content: space-between;
   margin: 20rpx 20rpx;
 }
+.order_list .order_item .product_title_status .title {
+  font-size: 30rpx;
+  color: #000000;
+}
+.order_list .order_item .product_title_status .status {
+  font-size: 24rpx;
+}
 .order_list .order_item .product_info {
   margin-left: 20rpx;
   display: flex;
 }
 .order_list .order_item .product_info .product_image {
-  width: 100rpx;
-  height: 100rpx;
+  width: 180rpx;
 }
 .order_list .order_item .product_info .product_image image {
-  width: 100rpx;
-  height: 100rpx;
+  width: 180rpx;
+  height: 160rpx;
+  border-radius: 40rpx;
 }
 .order_list .order_item .product_info .product_title_price {
-  margin-left: 20rpx;
+  margin: 0rpx 20rpx;
+}
+.order_list .order_item .product_info .product_title_price .title {
+  font-size: 34rpx;
+}
+.order_list .order_item .product_info .product_title_price .price {
+  font-size: 24rpx;
+  color: red;
+}
+.order_list .order_item .product_info .product_title_price .actual_pay {
+  text-align: right;
+  padding-right: 20rpx;
+  font-size: 24rpx;
+}
+.order_list .order_item .more_title {
+  width: 690rpx;
+  display: flex;
+  justify-content: flex-end;
+}
+.order_list .order_item .more_title .more {
+  padding: 20rpx;
+  position: relative;
+}
+.order_list .order_item .more_title .more .more-options {
+  position: absolute;
+  width: 150rpx;
+  right: 0;
+  top: 70rpx;
+  background-color: #333;
+  line-height: 1.5;
+  border: 1px solid #333;
 }

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

@@ -1 +1 @@
-<view><view class="product_box"><view class="product_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><image class="product_image" src="{{item.a}}" mode=""></image><view class="product_name"><text>{{item.b}}</text></view><view class="stock_price"><view class="product_price"><text>{{item.c}} 积分</text></view></view></view></view></view><view class="header_fixed"><view class="user_title"><view class="user_prc"><image src="{{b}}"></image></view><view class="title"><view class=""> 王先生 </view><view class=""> 5000积分 </view></view></view><view class="search"><view class="search_box"><view class="search_input"><input type="text" placeholder="一年级系统班"/></view><view class="search_icon"><uni-icons wx:if="{{c}}" u-i="3b340124-0" bind:__l="__l" u-p="{{c}}"></uni-icons></view></view></view><view class="course_option"><view class="option_name"> 综合 </view><view class="option_name"> 我可兑换 </view><view class="option_name"> 销量 </view><view class="option_name"> 积分 </view></view></view><view class="to_bottom"> -----到底了-----</view></view>
+<view><view class="product_box"><view class="product_list"><view wx:for="{{a}}" wx:for-item="item" wx:key="e" bindtap="{{item.d}}" data-eventsync="true" class="product_item"><image class="product_image" src="{{item.a}}" mode=""></image><view class="product_name"><text>{{item.b}}</text></view><view class="stock_price"><view class="product_price"><text>{{item.c}} 积分</text></view></view></view></view></view><view class="header_fixed"><view class="user_title"><view class="user_prc"><image src="{{b}}"></image></view><view class="title"><view class=""> 王先生 </view><view class=""> 5000积分 </view></view></view><view class="search"><view class="search_box"><view class="search_input"><input type="text" placeholder="一年级系统班"/></view><view class="search_icon"><uni-icons wx:if="{{c}}" u-i="481abc98-0" bind:__l="__l" u-p="{{c}}"></uni-icons></view></view></view><view class="course_option"><view class="option_name"> 综合 </view><view class="option_name"> 我可兑换 </view><view class="option_name"> 销量 </view><view class="option_name"> 积分 </view></view></view><view class="to_bottom"> -----到底了-----</view></view>

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

@@ -216,7 +216,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     D: common_vendor.t($data.productInfo.stock),
     E: common_vendor.t($data.priceTotal),
     F: common_vendor.o(($event) => $options.createOrder()),
-    G: common_vendor.sr("specPopup", "76dc1c0b-1"),
+    G: common_vendor.sr("specPopup", "425636b5-1"),
     H: common_vendor.o($options.popupChange),
     I: common_vendor.p({
       show: true,
@@ -238,7 +238,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         j: common_vendor.o(($event) => $options.checkedAddrItem(item), index)
       });
     }),
-    K: common_vendor.sr("addrPopup", "76dc1c0b-2"),
+    K: common_vendor.sr("addrPopup", "425636b5-2"),
     L: common_vendor.p({
       type: "bottom",
       ["background-color"]: "#FFFFFF"

文件差異過大導致無法顯示
+ 0 - 0
jiaoyu_mp/unpackage/dist/dev/mp-weixin/pagesA/score/product.wxml


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

@@ -1 +1 @@
-<view class="searchLayout"><view class="search"><uni-search-bar wx:if="{{e}}" bindconfirm="{{a}}" bindcancel="{{b}}" bindclear="{{c}}" u-i="5ae9faa2-0" bind:__l="__l" bindupdateModelValue="{{d}}" u-p="{{e}}"></uni-search-bar></view><view wx:if="{{f}}"><view wx:if="{{g}}" class="history"><view class="topTitle"><view class="text">最近搜索</view><view class="icon" bindtap="{{i}}"><uni-icons wx:if="{{h}}" u-i="5ae9faa2-1" bind:__l="__l" u-p="{{h}}"></uni-icons></view></view><view class="tabs"><view wx:for="{{j}}" wx:for-item="tab" wx:key="b" class="tab" bindtap="{{tab.c}}">{{tab.a}}</view></view></view><view class="recommend"><view class="topTitle"><view class="text">热门搜索</view></view><view class="tabs"><view wx:for="{{k}}" wx:for-item="tab" wx:key="b" class="tab" bindtap="{{tab.c}}">{{tab.a}}</view></view></view></view><view wx:if="{{l}}" class="noSearch"><uv-empty wx:if="{{m}}" u-i="5ae9faa2-2" bind:__l="__l" u-p="{{m}}"></uv-empty></view><view wx:else><view class="list"><navigator wx:for="{{n}}" wx:for-item="item" wx:key="c" url="{{item.b}}" class="item"><image src="{{item.a}}" mode="aspectFill"></image></navigator></view><view wx:if="{{o}}" class="lodinglayout"><uni-load-more wx:if="{{p}}" u-i="5ae9faa2-3" bind:__l="__l" u-p="{{p}}"/></view></view></view>
+<view class="searchLayout"><view class="search"><uni-search-bar wx:if="{{e}}" bindconfirm="{{a}}" bindcancel="{{b}}" bindclear="{{c}}" u-i="a8663a90-0" bind:__l="__l" bindupdateModelValue="{{d}}" u-p="{{e}}"></uni-search-bar></view><view wx:if="{{f}}"><view wx:if="{{g}}" class="history"><view class="topTitle"><view class="text">最近搜索</view><view class="icon" bindtap="{{i}}"><uni-icons wx:if="{{h}}" u-i="a8663a90-1" bind:__l="__l" u-p="{{h}}"></uni-icons></view></view><view class="tabs"><view wx:for="{{j}}" wx:for-item="tab" wx:key="b" class="tab" bindtap="{{tab.c}}">{{tab.a}}</view></view></view><view class="recommend"><view class="topTitle"><view class="text">热门搜索</view></view><view class="tabs"><view wx:for="{{k}}" wx:for-item="tab" wx:key="b" class="tab" bindtap="{{tab.c}}">{{tab.a}}</view></view></view></view><view wx:if="{{l}}" class="noSearch"><uv-empty wx:if="{{m}}" u-i="a8663a90-2" bind:__l="__l" u-p="{{m}}"></uv-empty></view><view wx:else><view class="list"><navigator wx:for="{{n}}" wx:for-item="item" wx:key="c" url="{{item.b}}" class="item"><image src="{{item.a}}" mode="aspectFill"></image></navigator></view><view wx:if="{{o}}" class="lodinglayout"><uni-load-more wx:if="{{p}}" u-i="a8663a90-3" bind:__l="__l" u-p="{{p}}"/></view></view></view>

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

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.6.4",
+  "libVersion": "3.6.5",
   "appid": "wx24a9669e84ba1f0b",
   "projectname": "开邻智数",
   "condition": {

+ 3 - 3
jiaoyu_mp/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,15 +8,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pagesA/course/index",
+          "name": "pages/product/index",
           "pathName": "pagesA/orders/userorder",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/product/index",
-          "pathName": "pagesA/user/index",
+          "name": "pagesA/course/index",
+          "pathName": "pagesA/orders/userorder",
           "query": "",
           "launchMode": "default",
           "scene": null

+ 1 - 1
jiaoyu_mp/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml

@@ -1 +1 @@
-<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="d3d86a90-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="d3d86a90-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
+<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="73e8bd62-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="73e8bd62-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>

部分文件因文件數量過多而無法顯示