Zory 5 ngày trước cách đây
mục cha
commit
d317d74f82

+ 13 - 6
pages/order/confirm.vue

@@ -63,8 +63,9 @@
 					</view>
 					<view class="sku_list">
 						<view :class="itm.check?'sku_item':'sku_item active'" v-for="(itm,iddx) in item.list" :key="iddx">
-							<view class="img" v-if="itm.img" @click="viewImg(itm.img)"><image :src="itm.img"></image></view>
-							<view class="name" @click="skuCheck(item.name,item.num,indx,iddx)" >{{itm.name}}</view>
+							<view class="img" v-if="itm.img" @click="skuCheck(item.name,item.num,indx,iddx)"><image :src="itm.img"></image></view>
+							<view :class="itm.img?'name':'name ac'" @click="skuCheck(item.name,item.num,indx,iddx)">{{itm.name}}</view>
+							<view class="pre" @click="viewImg(itm.img)" v-if="itm.img"><image src="/static/image/open.png"></image></view>
 						</view>
 					</view>
 				</view>
@@ -404,7 +405,7 @@ page{background-color: #f2f2f2;}
 	border-radius: 20upx;
 }
 .goods_skus .sku_name{
-	font-size: 32upx;
+	font-size: 28upx;
 	color: #000;
 	line-height: 60upx;
 	display: flex;
@@ -434,18 +435,24 @@ page{background-color: #f2f2f2;}
 	/* background: linear-gradient(90deg, rgba(254, 44, 86, 1) 0%, rgba(228, 100, 126, 1) 100%); */
 	color: #fe2c56;
 	border: 2upx solid #fe2c56;
-	background-color: #fff;
+	background-color: #ccc;
 }
 .goods_skus .sku_list .sku_item{
 	background-color: #f8f8f8;
 	border: 2upx solid #f8f8f8;
-	padding: 10upx 20upx;
 	margin-right: 20upx;
 	margin-bottom: 20upx;
 	border-radius: 5upx;
 	font-size: 28upx;
 	display: flex;
 	align-items: center;
+	flex-direction: column;
+	position: relative;
 }
-.goods_skus .sku_list .sku_item image{width: 50upx;height: 50upx;vertical-align: middle;margin-right: 10upx;}
+.goods_skus .sku_list .sku_item .pre{position: absolute;top: 0;left: 0;width: 40upx;height: 40upx;background-color: rgba(0, 0, 0, 0.5);border-radius: 0 0 20upx 0;z-index: 99;display: flex;align-items: center;justify-content: center;}
+.goods_skus .sku_list .sku_item .pre image{width: 25upx;height: 25upx;}
+.goods_skus .sku_list .sku_item .img{width: 100upx;}
+.goods_skus .sku_list .sku_item .img image{width: 100%;height: 100upx;vertical-align: middle;margin-right: 10upx;}
+.goods_skus .sku_list .sku_item .name{height: 40upx;line-height: 40upx;flex: 1;width: 100%;text-align: center;font-size: 26upx;}
+.goods_skus .sku_list .sku_item .name.ac{padding: 10upx 20upx;height: 40upx;line-height: 40upx;}
 </style>

BIN
static/image/.DS_Store


BIN
static/image/open.png


+ 2 - 2
static/js/request.js

@@ -13,8 +13,8 @@ const axg = {
 		return '/api';
 		// #endif
 		// #ifdef MP
-		return 'https://miniapi.jsshuita.com.cn/api/dy'
-		// return 'http://127.0.0.1:8190/api/dy'
+		// return 'https://miniapi.jsshuita.com.cn/api/dy'
+		return 'http://127.0.0.1:8190/api/dy'
 		// #endif
 	},
 	toast: function(text, duration, success) { 

+ 17 - 0
unpackage/dist/build/mp-toutiao/project.private.config.json

@@ -1,5 +1,22 @@
 {
     "setting": {
         "urlCheck": false
+    },
+    "condition": {
+        "miniprogram": {
+            "current": 1765091639929,
+            "list": [
+                {
+                    "id": 1765091639929,
+                    "name": "单个订单",
+                    "pathName": "pages/order/detail",
+                    "query": "order_id=1090199972282268984&account_id=7513378475235919883",
+                    "scene": "990001",
+                    "launchFrom": "scan",
+                    "location": "qr_code",
+                    "mockUpdateType": "Noupdate"
+                }
+            ]
+        }
     }
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-toutiao/common/vendor.js.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-toutiao/pages/order/confirm.js.map


+ 2 - 3
unpackage/dist/dev/mp-toutiao/common/vendor.js

@@ -19803,10 +19803,9 @@ var axg = {
   },
   //接口地址
   interfaceUrl: function interfaceUrl() {
-    return 'https://miniapi.jsshuita.com.cn/api/dy';
-    // return 'http://127.0.0.1:8190/api/dy'
+    // return 'https://miniapi.jsshuita.com.cn/api/dy'
+    return 'http://127.0.0.1:8190/api/dy';
   },
-
   toast: function toast(text, duration, success) {},
   modal: function modal(title, content, showCancel, callback, confirmColor, confirmText) {
     uni.showModal({

+ 1 - 0
unpackage/dist/dev/mp-toutiao/pages/order/confirm.js

@@ -308,6 +308,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 //
 //
 //
+//
 
 var app;
 var _default = {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
unpackage/dist/dev/mp-toutiao/pages/order/confirm.ttml


+ 10 - 4
unpackage/dist/dev/mp-toutiao/pages/order/confirm.ttss

@@ -74,7 +74,7 @@ page{background-color: #f2f2f2;}
 	border-radius: 20rpx;
 }
 .goods_skus .sku_name{
-	font-size: 32rpx;
+	font-size: 28rpx;
 	color: #000;
 	line-height: 60rpx;
 	display: flex;
@@ -104,18 +104,24 @@ page{background-color: #f2f2f2;}
 	/* background: linear-gradient(90deg, rgba(254, 44, 86, 1) 0%, rgba(228, 100, 126, 1) 100%); */
 	color: #fe2c56;
 	border: 2rpx solid #fe2c56;
-	background-color: #fff;
+	background-color: #ccc;
 }
 .goods_skus .sku_list .sku_item{
 	background-color: #f8f8f8;
 	border: 2rpx solid #f8f8f8;
-	padding: 10rpx 20rpx;
 	margin-right: 20rpx;
 	margin-bottom: 20rpx;
 	border-radius: 5rpx;
 	font-size: 28rpx;
 	display: flex;
 	align-items: center;
+	flex-direction: column;
+	position: relative;
 }
-.goods_skus .sku_list .sku_item image{width: 50rpx;height: 50rpx;vertical-align: middle;margin-right: 10rpx;}
+.goods_skus .sku_list .sku_item .pre{position: absolute;top: 0;left: 0;width: 40rpx;height: 40rpx;background-color: rgba(0, 0, 0, 0.5);border-radius: 0 0 20rpx 0;z-index: 99;display: flex;align-items: center;justify-content: center;}
+.goods_skus .sku_list .sku_item .pre image{width: 25rpx;height: 25rpx;}
+.goods_skus .sku_list .sku_item .img{width: 100rpx;}
+.goods_skus .sku_list .sku_item .img image{width: 100%;height: 100rpx;vertical-align: middle;margin-right: 10rpx;}
+.goods_skus .sku_list .sku_item .name{height: 40rpx;line-height: 40rpx;flex: 1;width: 100%;text-align: center;font-size: 26rpx;}
+.goods_skus .sku_list .sku_item .name.ac{padding: 10rpx 20rpx;height: 40rpx;line-height: 40rpx;}
 

+ 7 - 6
unpackage/dist/dev/mp-toutiao/project.private.config.json

@@ -4,7 +4,7 @@
     },
     "condition": {
         "miniprogram": {
-            "current": -1,
+            "current": 1765037518942,
             "list": [
                 {
                     "id": 1764343987265,
@@ -70,11 +70,12 @@
                     "id": 1765037518942,
                     "name": "预约",
                     "pathName": "pages/order/confirm",
-                    "query": "order=1090199972282268984&poi_id=7525335560169195562&poi_name=%E6%B6%A4%E6%96%90%E5%85%88%E7%94%9F%E9%AB%98%E7%AB%AF%E6%B4%97%E6%8A%A4&juli=1286.23&__id__=2",
-                    "scene": "990001",
-                    "launchFrom": "scan",
-                    "location": "qr_code",
-                    "mockUpdateType": "Noupdate"
+                    "query": "order=7581029560662229043&poi_id=7525335560169195562&poi_name=%E6%B6%A4%E6%96%90%E5%85%88%E7%94%9F%E9%AB%98%E7%AB%AF%E6%B4%97%E6%8A%A4&juli=1286.23&__id__=3",
+                    "scene": "011001",
+                    "launchFrom": "search_used_list",
+                    "location": "",
+                    "mockUpdateType": "Noupdate",
+                    "addType": "manual"
                 }
             ]
         }

BIN
unpackage/dist/dev/mp-toutiao/static/image/.DS_Store


BIN
unpackage/dist/dev/mp-toutiao/static/image/open.png


BIN
unpackage/dist/dev/mp-toutiao/static/image/放大.png


+ 2 - 2
unpackage/dist/dev/mp-toutiao/static/js/request.js

@@ -13,8 +13,8 @@ const axg = {
 		return '/api';
 		// #endif
 		// #ifdef MP
-		return 'https://miniapi.jsshuita.com.cn/api/dy'
-		// return 'http://127.0.0.1:8190/api/dy'
+		// return 'https://miniapi.jsshuita.com.cn/api/dy'
+		return 'http://127.0.0.1:8190/api/dy'
 		// #endif
 	},
 	toast: function(text, duration, success) { 

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác