hwq 1 year ago
parent
commit
9a86b9fdc3
100 changed files with 1185 additions and 1060 deletions
  1. 130 129
      manifest.json
  2. 1054 930
      pages/product/product.vue
  3. BIN
      unpackage/cache/apk/__UNI__9A7699F_cm.apk
  4. 1 1
      unpackage/cache/apk/apkurl
  5. 0 0
      unpackage/cache/apk/cmManifestCache.json
  6. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/google-keystore.keystore
  7. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-hdpi.png
  8. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xhdpi.png
  9. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xxhdpi.png
  10. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xxxhdpi.png
  11. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-hdpi.9.png
  12. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-xhdpi.9.png
  13. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-xxhdpi.9.png
  14. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappchooselocation.js
  15. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniapperror.png
  16. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappes6.js
  17. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappopenlocation.js
  18. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniapppicker.js
  19. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappquill.js
  20. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappquillimageresize.js
  21. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappscan.js
  22. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappsuccess.png
  23. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/__uniappview.html
  24. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/app-config-service.js
  25. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/app-config.js
  26. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/app-service.js
  27. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/app-view.js
  28. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/manifest.json
  29. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/css/cmy.css
  30. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/error/emptyCart.png
  31. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/error/errorImage.jpg
  32. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/error/missing-face.png
  33. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/appleIcon.png
  34. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/bdjj.png
  35. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/btncz.png
  36. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/call.png
  37. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/dh.png
  38. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/dsjh.png
  39. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/dw.png
  40. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/fanhui.png
  41. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/fhsy.png
  42. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/gou.png
  43. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/guanbi@2x.png
  44. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/i8.png
  45. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/index06.png
  46. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/index1.png
  47. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/jindou.png
  48. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n1.png
  49. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n2.png
  50. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n3.png
  51. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n4.png
  52. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n5.png
  53. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n6.png
  54. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n7.png
  55. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/n8.png
  56. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/search-h.png
  57. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/select.png
  58. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/selected.png
  59. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/sh-log.png
  60. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/skxx.png
  61. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tdjj.png
  62. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/team.png
  63. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/title-icon.png
  64. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-1.png
  65. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-2.png
  66. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-3.png
  67. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-4.png
  68. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-5.png
  69. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-6.png
  70. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/uset.png
  71. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/icon/wenhao.png
  72. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/add.png
  73. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/address.png
  74. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/afternoon.png
  75. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/ali.png
  76. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/aliD.png
  77. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/arc.png
  78. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/back.png
  79. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/backb.png
  80. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/bank.png
  81. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/bankD.png
  82. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/been.png
  83. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/busy.png
  84. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/call.png
  85. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/cart.png
  86. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/copy.png
  87. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/delete.png
  88. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/deletes.png
  89. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/djs1.png
  90. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/download.png
  91. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/evening.png
  92. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/eveningicon.png
  93. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/fanhui.png
  94. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/gong.png
  95. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/gssy.png
  96. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/hall-bg.png
  97. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/hell-main1.png
  98. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/hinco.png
  99. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/hinfo-bg1.png
  100. 0 0
      unpackage/cache/wgt/__UNI__9A7699F/static/img/img009.png

+ 130 - 129
manifest.json

@@ -1,132 +1,133 @@
 {
-	"name": "易趣CBB",
-	"appid": "__UNI__F0EBD91",
-	"description": "",
-	"versionName": "1.2.7",
-	"versionCode": 127,
-	"transformPx": false,
-	"app-plus": {
-		/* 5+App特有相关 */
-		"usingComponents": true,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"modules": {
-			"VideoPlayer": {},
-			"Camera": {}
-		},
-		/* 模块配置 */
-		"distribute": {
-			/* 应用发布信息 */
-			"android": {
-				/* android打包配置 */
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
-				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
-			},
-			"ios": {
-				"idfa": false,
-				"dSYMs": false
-			},
-			/* ios打包配置 */
-			"sdkConfigs": {
-				"maps": {},
-				"oauth": {
-					"weixin": {
-						"appid": "",
-						"appsecret": "",
-						"UniversalLinks": ""
-					}
-				},
-				"ad": {},
-				"geolocation": {}
-			},
-			"splashscreen": {
-				"androidStyle": "default",
-				"android": {
-					"hdpi": "unpackage/480.9.png",
-					"xhdpi": "unpackage/720.9.png",
-					"xxhdpi": "unpackage/1080.9.png"
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* SDK配置 */
-	"quickapp": {},
-	/* 快应用特有相关 */
-	"mp-weixin": {
-		/* 小程序特有相关 */
-		"usingComponents": true,
-		"appid": "",
-		"setting": {
-			"urlCheck": true
-		}
-	},
-	"h5": {
-		"title": "商城",
-		"domain": "",
-		"router": {
-			"base": "/index/",
-			"mode": "hash"
-		},
-		"devServer": {
-			"proxy": {
-				"/api": {
-					"target": "https://www.shangshigo.com", //请求的目标域名
+    "name" : "易趣CBB",
+    "appid" : "__UNI__9A7699F",
+    "description" : "",
+    "versionName" : "1.2.8",
+    "versionCode" : 128,
+    "transformPx" : false,
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "VideoPlayer" : {},
+            "Camera" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            "ios" : {
+                "idfa" : false,
+                "dSYMs" : false
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "maps" : {},
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "",
+                        "appsecret" : "",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "ad" : {},
+                "geolocation" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "android" : {
+                    "hdpi" : "unpackage/480.9.png",
+                    "xhdpi" : "unpackage/720.9.png",
+                    "xxhdpi" : "unpackage/1080.9.png"
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "usingComponents" : true,
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : true
+        }
+    },
+    "h5" : {
+        "title" : "商城",
+        "domain" : "",
+        "router" : {
+            "base" : "/index/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "proxy" : {
+                "/api" : {
+                    "target" : "https://www.shangshigo.com", //请求的目标域名
 
-					// "target": "http://qudou.frp.liuniu946.com", //请求的目标域名
-					"changeOrigin": true,
-					// "secure": false,
-					"pathRewrite": {}
-				}
-			}
-		},
-		"sdkConfigs": {
-			"maps": {
-				"qqmap": {
-					"key": "VYZBZ-P2TRG-RMIQ3-ITAIN-2DKBK-CKFQQ"
-				}
-			}
-		}
-	}
+                    // "target": "http://qudou.frp.liuniu946.com", //请求的目标域名
+                    "changeOrigin" : true,
+                    // "secure": false,
+                    "pathRewrite" : {}
+                }
+            }
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "VYZBZ-P2TRG-RMIQ3-ITAIN-2DKBK-CKFQQ"
+                }
+            }
+        }
+    }
 }
-// "^/api": "/"
+// "^/api": "/"
+

+ 1054 - 930
pages/product/product.vue

@@ -3,7 +3,9 @@
 		<view class="carousel">
 			<swiper indicator-dots :circular="true" duration="400">
 				<swiper-item class="swiper-item" v-for="(item, index) in imgList" :key="index">
-					<view class="image-wrapper"><image :src="item" class="loaded" mode="scaleToFill"></image></view>
+					<view class="image-wrapper">
+						<image :src="item" class="loaded" mode="scaleToFill"></image>
+					</view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -18,15 +20,9 @@
 				</view>
 				<view class="flex timeStop">
 					<view>距离结束</view>
-					<uni-countdown
-						color="#ffffff"
-						background-color="#D65B3F"
-						splitor-color="#FFFFFF"
-						:show-day="false"
-						:hour="seckillObj.stopTimeH"
-						:minute="seckillObj.stopTimeM"
-						:second="seckillObj.stopTimeS"
-					></uni-countdown>
+					<uni-countdown color="#ffffff" background-color="#D65B3F" splitor-color="#FFFFFF" :show-day="false"
+						:hour="seckillObj.stopTimeH" :minute="seckillObj.stopTimeM"
+						:second="seckillObj.stopTimeS"></uni-countdown>
 				</view>
 			</view>
 		</view>
@@ -46,7 +42,7 @@
 			<view class="bot-row">
 				<text>快递: {{ goodsObjact.postage }}</text>
 				<text style="text-align: center;">销量: {{ goodsObjact.sales }}</text>
-				<text style="text-align: right;">{{ storeObjact.address | address }}</text>
+				<!-- <text style="text-align: right;">{{ storeObjact.address | address }}</text> -->
 			</view>
 		</view>
 		<!-- <view class="c-list">
@@ -88,12 +84,15 @@
 				<image :src="shopInfo.logo" mode=" aspectFit" class="shop-img"></image>
 				<text class="font-size-lg">{{ shopInfo.title }}</text>
 			</view>
-			<navigator :url="'/pages/shoping/index?merid=' + shopId"><view class="shop-button">进店逛逛</view></navigator>
+			<navigator :url="'/pages/shoping/index?merid=' + shopId">
+				<view class="shop-button">进店逛逛</view>
+			</navigator>
 		</view>
 		<view class="detail-desc">
 			<view class="d-header"><text>商品详情</text></view>
 			<rich-text class="detail-centent" :nodes="goodsObjact.description"></rich-text>
-			<view :class="{ contentBottomHeight: goodsType == 1 || goodsType == 2, goodsBottom: goodsType == 0 }"></view>
+			<view :class="{ contentBottomHeight: goodsType == 1 || goodsType == 2, goodsBottom: goodsType == 0 }">
+			</view>
 		</view>
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom" v-if="goodsType == 0">
@@ -155,13 +154,8 @@
 				<view v-for="(item, index) in specList" :key="index" class="attr-list">
 					<text>{{ item.attr_name }}</text>
 					<view class="item-list">
-						<text
-							v-for="(childItem, childIndex) in item.attr_value"
-							:key="childIndex"
-							class="tit"
-							:class="{ selected: childItem.check }"
-							@click="selectSpec(childItem, item, index)"
-						>
+						<text v-for="(childItem, childIndex) in item.attr_value" :key="childIndex" class="tit"
+							:class="{ selected: childItem.check }" @click="selectSpec(childItem, item, index)">
 							{{ childItem.attr }}
 						</text>
 					</view>
@@ -169,7 +163,8 @@
 				<view class="attr-list" style="padding-bottom: 120rpx;">
 					<text>购买数量</text>
 					<view class="item-list">
-						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax" @eventChange="numberChange"></uni-number-box>
+						<uni-number-box class="step" :isMin="true" :value="goodsNumber" :min="1" :max="goodsNumberMax"
+							@eventChange="numberChange"></uni-number-box>
 					</view>
 				</view>
 				<button class="btn" @click.stop="buy">确定</button>
@@ -182,133 +177,233 @@
 </template>
 
 <script>
-// import share from '@/components/share';
-import uniNumberBox from '@/components/uni-number-box.vue';
-import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-import { goodsDetail, cartAdd, collectAdd, collectDel, seckillGoods, groupGoods } from '@/api/product.js';
-import { timeComputed } from '@/utils/rocessor.js';
-// #ifdef H5
-import { weixindata, shareLoad } from '@/utils/wxAuthorized';
-import { mapState } from 'vuex';
-import weixinObj from '@/plugin/jweixin-module/index.js';
-// #endif
-export default {
-	components: {
-		uniNumberBox,
-		uniCountdown
-	},
-	filters: {
-		address(val) {
-			let str = '';
-			if (val) {
-				str = val[0] + ' ' + val[1];
+	// import share from '@/components/share';
+	import uniNumberBox from '@/components/uni-number-box.vue';
+	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+	import {
+		goodsDetail,
+		cartAdd,
+		collectAdd,
+		collectDel,
+		seckillGoods,
+		groupGoods
+	} from '@/api/product.js';
+	import {
+		timeComputed
+	} from '@/utils/rocessor.js';
+	// #ifdef H5
+	import {
+		weixindata,
+		shareLoad
+	} from '@/utils/wxAuthorized';
+	import {
+		mapState
+	} from 'vuex';
+	import weixinObj from '@/plugin/jweixin-module/index.js';
+	// #endif
+	export default {
+		components: {
+			uniNumberBox,
+			uniCountdown
+		},
+		filters: {
+			address(val) {
+				let str = '';
+				if (val) {
+					str = val[0] + ' ' + val[1];
+				}
+				return str;
 			}
-			return str;
-		}
-	},
-	data() {
-		return {
-			actionIntegral: '',
-			reply: '', //评论
-			type: 1, //默认支付方式add为
-			goodsNumber: 1, //购买数量
-			goodsid: '', //商品id
-			specClass: 'none', //显示隐藏弹窗
-			shareList: [], //分享列表
-			goodsObjact: {}, //保存商品数据
-			storeObjact: {}, //保存店铺数据
-			//图片循环
-			imgList: [],
-			specList: [],
-			// 对比对象
-			productValue: [],
-			actionPrice: 0, //默认选中商品价格
-			actionImage: '', //默认选中图片
-			uniqueId: '', //选中的商品分类
-			specSelected: [], //选中的分类
-			specSelectedName: '', //选中分类名称
-			goodsNumberMax: 0, //最大可购买数量
-			shopId: '', //商店id
-			//商店信息
-			shopInfo: {
-				logo: '',
-				title: ''
-			}, //商店信息
-			goodsType: 0, //商品类型1秒杀商品0为普通商品2为拼团商品
-			// 秒杀数据保存
-			seckillObj: {
-				stopTime: 0, //结束时间
-				stop: false, //是否结束
-				stopTimeH: 0, //小时
-				stopTimeM: 0, //分钟
-				stopTimeS: 0 //秒钟
-			},
-			// 拼团数据保存
-			pink: {
-				id: '', //拼团编号
-				uid: '', //用户编号
-				people: '', //拼团人数
-				price: '', //拼团价格
-				stop_time: '', //拼团结束时间
-				nickname: '', //团长昵称
-				avatar: '', //团长头像
-				count: '', //拼团剩余人数
-				h: '', //时
-				i: '', //分
-				s: '' //秒
+		},
+		data() {
+			return {
+				actionIntegral: '',
+				reply: '', //评论
+				type: 1, //默认支付方式add为
+				goodsNumber: 1, //购买数量
+				goodsid: '', //商品id
+				specClass: 'none', //显示隐藏弹窗
+				shareList: [], //分享列表
+				goodsObjact: {}, //保存商品数据
+				storeObjact: {}, //保存店铺数据
+				//图片循环
+				imgList: [],
+				specList: [],
+				// 对比对象
+				productValue: [],
+				actionPrice: 0, //默认选中商品价格
+				actionImage: '', //默认选中图片
+				uniqueId: '', //选中的商品分类
+				specSelected: [], //选中的分类
+				specSelectedName: '', //选中分类名称
+				goodsNumberMax: 0, //最大可购买数量
+				shopId: '', //商店id
+				//商店信息
+				shopInfo: {
+					logo: '',
+					title: ''
+				}, //商店信息
+				goodsType: 0, //商品类型1秒杀商品0为普通商品2为拼团商品
+				// 秒杀数据保存
+				seckillObj: {
+					stopTime: 0, //结束时间
+					stop: false, //是否结束
+					stopTimeH: 0, //小时
+					stopTimeM: 0, //分钟
+					stopTimeS: 0 //秒钟
+				},
+				// 拼团数据保存
+				pink: {
+					id: '', //拼团编号
+					uid: '', //用户编号
+					people: '', //拼团人数
+					price: '', //拼团价格
+					stop_time: '', //拼团结束时间
+					nickname: '', //团长昵称
+					avatar: '', //团长头像
+					count: '', //拼团剩余人数
+					h: '', //时
+					i: '', //分
+					s: '' //秒
+				}
+			};
+		},
+		async onLoad(options) {
+			let obj = this;
+			//保存商品id
+			this.goodsid = options.id;
+			// 判断有无人邀请
+			if (options.spread) {
+				// 存储邀请人
+				uni.setStorageSync('spread', options.spread);
 			}
-		};
-	},
-	async onLoad(options) {
-		let obj = this;
-		//保存商品id
-		this.goodsid = options.id;
-		// 判断有无人邀请
-		if (options.spread) {
-			// 存储邀请人
-			uni.setStorageSync('spread', options.spread);
-		}
-		// 判断是否为秒杀商品
-		if (options.type == 1) {
-			// 保存商品类型
-			this.goodsType = 1;
-			// 保存结束时间
-			this.seckillObj.stopTime = options.stoptime;
-			// 获取当前时间毫秒数
-			let stoptime = options.stoptime * 1000;
-			// 获取当前时间
-			let acitonTime = new Date();
-			// 判断当前时间是否大于结束时间
-			seckillGoods({}, this.goodsid).then(({ data }) => {
-				obj.list = data;
-				console.log(obj.list, '秒杀商品数据++++++++++');
-				// obj.good_list = data.good_list; //保存猜你喜欢列表
-				obj.reply = data.reply; //保存评论列表
-				let goods = data.storeInfo;
-				obj.goodsNumberMax = goods.num;
-				// console.log('obj.goodsNumberMin+++++++++',obj.goodsNumberMin)
-				console.log(goods.stop_time, '时间');
-				const time = timeComputed(goods.stop_time);
-				obj.seckillObj = {
-					stop: time.tpye, //是否结束
-					stopTimeH: time.hours, //小时
-					stopTimeM: time.minutes, //分钟
-					stopTimeS: time.seconds //秒钟
-				};
+			// 判断是否为秒杀商品
+			if (options.type == 1) {
+				// 保存商品类型
+				this.goodsType = 1;
+				// 保存结束时间
+				this.seckillObj.stopTime = options.stoptime;
+				// 获取当前时间毫秒数
+				let stoptime = options.stoptime * 1000;
+				// 获取当前时间
+				let acitonTime = new Date();
+				// 判断当前时间是否大于结束时间
+				seckillGoods({}, this.goodsid).then(({
+					data
+				}) => {
+					obj.list = data;
+					console.log(obj.list, '秒杀商品数据++++++++++');
+					// obj.good_list = data.good_list; //保存猜你喜欢列表
+					obj.reply = data.reply; //保存评论列表
+					let goods = data.storeInfo;
+					obj.goodsNumberMax = goods.num;
+					// console.log('obj.goodsNumberMin+++++++++',obj.goodsNumberMin)
+					console.log(goods.stop_time, '时间');
+					const time = timeComputed(goods.stop_time);
+					obj.seckillObj = {
+						stop: time.tpye, //是否结束
+						stopTimeH: time.hours, //小时
+						stopTimeM: time.minutes, //分钟
+						stopTimeS: time.seconds //秒钟
+					};
 
-				console.log(obj.seckillObj, '数据');
-				// console.log(obj.seckillObj,'obj.seckillObj++++++++++++++++++++++')
-				obj.goodsObjact = goods;
-				if (obj.goodsObjact.description != null) {
-					obj.description = obj.goodsObjact.description.replace(/\<img/gi, '<img class="rich-img"');
-				} //小程序商品详情图超出屏幕问题
-				obj.imgList = goods.images; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				if (Array.isArray(data.productValue) != true) {
-					console.log('多规格+++++++++++++');
-					obj.many = 2;
-					obj.specList = data.productAttr; //保存产品属性
-					obj.productValue = data.productValue; //保存属性值
+					console.log(obj.seckillObj, '数据');
+					// console.log(obj.seckillObj,'obj.seckillObj++++++++++++++++++++++')
+					obj.goodsObjact = goods;
+					if (obj.goodsObjact.description != null) {
+						obj.description = obj.goodsObjact.description.replace(/\<img/gi,
+							'<img class="rich-img"');
+					} //小程序商品详情图超出屏幕问题
+					obj.imgList = goods.images; //保存轮播图
+					obj.specList = data.productAttr; //保存分类列表
+					if (Array.isArray(data.productValue) != true) {
+						console.log('多规格+++++++++++++');
+						obj.many = 2;
+						obj.specList = data.productAttr; //保存产品属性
+						obj.productValue = data.productValue; //保存属性值
+						obj.specSelected = []; //初始化默认选择对象
+						for (let i = 0; i < obj.specList.length; i++) {
+							// 设置默认数据
+							let attrValue = obj.specList[i].attr_value[0];
+							attrValue.check = true;
+							obj.specSelected.push(attrValue.attr);
+						}
+						let str = obj.specSelected.join(',');
+						console.log(str, 'str');
+						// 设置默认值
+						obj.actionPrice = obj.productValue[str].price;
+						// obj.goodsNumberMax = obj.productValue[str].quota;
+						// console.log(obj.goodsNumberMax,'obj.goodsNumberMax++++++++++++')
+						obj.actionImage = obj.productValue[str].image;
+						obj.uniqueId = obj.productValue[str].unique;
+						obj.goodsStore = obj.productValue[str].stock;
+					} else {
+						console.log('单规格+++++++++++++');
+						obj.many = 1;
+						obj.productValue = data.productValue; //保存分类查询数据
+						obj.actionPrice = goods.price; //保存默认选中商品价格
+						obj.actionImage = goods.image_base; //保存默认选中商品图片
+						// obj.goodsNumberMax = goods.quota; //保存默认选中最大可购买商品数量
+						console.log(obj.goodsNumberMax, 'obj.goodsNumberMax---------------');
+						obj.shopId = data.mer_id; //保存商店id
+					}
+				});
+			}
+			if (options.type == 2) {
+				// 保存当前拼团商品类型
+				this.goodsType = 2;
+				// 家在数据
+				this.groupGoods();
+				return;
+			}
+			if (this.goodsType == 0) {
+				// 加载普通商品详情
+				this.goodsDetail();
+			}
+		},
+		computed: {
+			// #ifdef H5
+			...mapState(['weichatObj', 'baseURL', 'urlFile']),
+			...mapState('user', ['userInfo'])
+			// #endif
+		},
+		methods: {
+			navTo(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			// 转换字符串为数字
+			moneyNum: function(value) {
+				return +value;
+			},
+			navToProductGoods() {
+				uni.redirectTo({
+					url: '/pages/product/product?id=' + this.goodsObjact.product_id
+				});
+			},
+			// 获取商品信息
+			goodsDetail() {
+				let obj = this;
+				goodsDetail({}, this.goodsid).then(function({
+					data
+				}) {
+					obj.actionIntegral = data.integral;
+					let goods = data.storeInfo;
+					let store_info = data.system_store; // 保存店铺信息
+					console.log(store_info);
+					obj.storeObjact = store_info;
+					obj.goodsObjact = goods;
+					obj.reply = data.reply; //保存评论列表
+					obj.imgList = goods.slider_image; //保存轮播图
+					obj.specList = data.productAttr; //保存分类列表
+					console.log(data.productAttr);
+					obj.productValue = data.productValue; //保存分类查询数据
+					obj.actionPrice = goods.price; //保存默认选中商品价格
+					obj.actionImage = goods.image_base; //保存默认选中商品价格
+					obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
+					obj.shopId = data.mer_id; //保存商店id
+					// 保存默认选中的对象
 					obj.specSelected = []; //初始化默认选择对象
 					for (let i = 0; i < obj.specList.length; i++) {
 						// 设置默认数据
@@ -316,896 +411,925 @@ export default {
 						attrValue.check = true;
 						obj.specSelected.push(attrValue.attr);
 					}
+
+					//保存默认选中的对象字符串名称
 					let str = obj.specSelected.join(',');
-					console.log(str, 'str');
 					// 设置默认值
-					obj.actionPrice = obj.productValue[str].price;
-					// obj.goodsNumberMax = obj.productValue[str].quota;
-					// console.log(obj.goodsNumberMax,'obj.goodsNumberMax++++++++++++')
 					obj.actionImage = obj.productValue[str].image;
 					obj.uniqueId = obj.productValue[str].unique;
-					obj.goodsStore = obj.productValue[str].stock;
-				} else {
-					console.log('单规格+++++++++++++');
-					obj.many = 1;
-					obj.productValue = data.productValue; //保存分类查询数据
-					obj.actionPrice = goods.price; //保存默认选中商品价格
-					obj.actionImage = goods.image_base; //保存默认选中商品图片
-					// obj.goodsNumberMax = goods.quota; //保存默认选中最大可购买商品数量
-					console.log(obj.goodsNumberMax, 'obj.goodsNumberMax---------------');
-					obj.shopId = data.mer_id; //保存商店id
+					// #ifdef H5
+					obj.shareDate();
+					// #endif
+				});
+			},
+			// #ifdef H5
+			// 加载微信html5页面分享方法
+			shareDate() {
+				let obj = this;
+				// 保存分享人id链接
+				let url = window.location.href + '&spread=' + this.userInfo.uid;
+				// 判断是否微信浏览器
+				let bool = uni.getStorageSync('weichatBrowser') || '';
+				if (bool) {
+					// 过滤微信强制添加的链接地址
+					url = url.replace(/[\?,&]from=singlemessage/g, '');
+					let data = {
+						link: url, // 分享链接
+						imgUrl: obj.goodsObjact.image, // 分享图标
+						desc: obj.goodsObjact.store_info,
+						title: obj.goodsObjact.store_name,
+						success: function(e) {
+							console.log(e);
+						}
+					};
+					shareLoad(data);
 				}
-			});
-		}
-		if (options.type == 2) {
-			// 保存当前拼团商品类型
-			this.goodsType = 2;
-			// 家在数据
-			this.groupGoods();
-			return;
-		}
-		if (this.goodsType == 0) {
-			// 加载普通商品详情
-			this.goodsDetail();
-		}
-	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj', 'baseURL', 'urlFile']),
-		...mapState('user', ['userInfo'])
-		// #endif
-	},
-	methods: {
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		// 转换字符串为数字
-		moneyNum: function(value) {
-			return +value;
-		},
-		navToProductGoods() {
-			uni.redirectTo({
-				url: '/pages/product/product?id=' + this.goodsObjact.product_id
-			});
-		},
-		// 获取商品信息
-		goodsDetail() {
-			let obj = this;
-			goodsDetail({}, this.goodsid).then(function({ data }) {
-				obj.actionIntegral = data.integral;
-				let goods = data.storeInfo;
-				let store_info = data.system_store; // 保存店铺信息
-				console.log(store_info);
-				obj.storeObjact = store_info;
-				obj.goodsObjact = goods;
-				obj.reply = data.reply; //保存评论列表
-				obj.imgList = goods.slider_image; //保存轮播图
-				obj.specList = data.productAttr; //保存分类列表
-				console.log(data.productAttr);
-				obj.productValue = data.productValue; //保存分类查询数据
-				obj.actionPrice = goods.price; //保存默认选中商品价格
-				obj.actionImage = goods.image_base; //保存默认选中商品价格
-				obj.goodsNumberMax = goods.stock; //保存默认选中最大可购买商品数量
-				obj.shopId = data.mer_id; //保存商店id
-				// 保存默认选中的对象
-				obj.specSelected = []; //初始化默认选择对象
-				for (let i = 0; i < obj.specList.length; i++) {
-					// 设置默认数据
-					let attrValue = obj.specList[i].attr_value[0];
-					attrValue.check = true;
-					obj.specSelected.push(attrValue.attr);
+			},
+			// #endif
+			// 购买数量变化
+			numberChange(e) {
+				this.goodsNumber = e.number;
+			},
+			//规格弹窗开关
+			toggleSpec(str) {
+				if (this.specClass === 'show') {
+					this.specClass = 'hide';
+					setTimeout(() => {
+						this.specClass = 'none';
+					}, 250);
+				} else if (this.specClass === 'none') {
+					this.specClass = 'show';
 				}
-
-				//保存默认选中的对象字符串名称
-				let str = obj.specSelected.join(',');
-				// 设置默认值
-				obj.actionImage = obj.productValue[str].image;
-				obj.uniqueId = obj.productValue[str].unique;
-				// #ifdef H5
-				obj.shareDate();
-				// #endif
-			});
-		},
-		// #ifdef H5
-		// 加载微信html5页面分享方法
-		shareDate() {
-			let obj = this;
-			// 保存分享人id链接
-			let url = window.location.href + '&spread=' + this.userInfo.uid;
-			// 判断是否微信浏览器
-			let bool = uni.getStorageSync('weichatBrowser') || '';
-			if (bool) {
-				// 过滤微信强制添加的链接地址
-				url = url.replace(/[\?,&]from=singlemessage/g, '');
-				let data = {
-					link: url, // 分享链接
-					imgUrl: obj.goodsObjact.image, // 分享图标
-					desc: obj.goodsObjact.store_info,
-					title: obj.goodsObjact.store_name,
-					success: function(e) {
-						console.log(e);
-					}
-				};
-				shareLoad(data);
-			}
-		},
-		// #endif
-		// 购买数量变化
-		numberChange(e) {
-			this.goodsNumber = e.number;
-		},
-		//规格弹窗开关
-		toggleSpec(str) {
-			if (this.specClass === 'show') {
-				this.specClass = 'hide';
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 250);
-			} else if (this.specClass === 'none') {
-				this.specClass = 'show';
-			}
-			// 保存当前购买类型
-			this.type = str;
-		},
-		//选择规格
-		selectSpec(item, arr, ind) {
-			arr.attr_value.forEach(function(e) {
-				e.check = false;
-			});
-			item.check = true;
-			this.specSelected[ind] = item.attr;
-			let str = this.specSelected.join(',');
-			this.specSelectedName = this.specSelected.join(' ');
-			console.log(this.productValue, str);
-			if (this.productValue[str]) {
-				let data = this.productValue[str];
-				this.actionIntegral = data.integral;
-				this.actionPrice = data.price;
-				this.goodsNumberMax = data.stock;
-				this.actionImage = data.image;
-				this.uniqueId = data.unique;
-			}
-		},
-		//分享
-		share() {
-			this.$refs.share.toggleMask();
-		},
-		//收藏
-		toFavorite(item) {
-			let obj = this;
-			item.userCollect = !item.userCollect;
-			if (!item.userCollect) {
-				collectDel({ id: obj.goodsid, category: 'product' }).then(function(e) {
-					uni.showToast({
-						title: '成功取消收藏',
-						type: 'top',
-						duration: 1500
-					});
-				});
-			} else {
-				collectAdd({ id: obj.goodsid, category: 'product' }).then(function(e) {
-					uni.showToast({
-						title: '成功加入收藏',
-						type: 'top',
-						duration: 1500
-					});
+				// 保存当前购买类型
+				this.type = str;
+			},
+			//选择规格
+			selectSpec(item, arr, ind) {
+				arr.attr_value.forEach(function(e) {
+					e.check = false;
 				});
-			}
-		},
-		// 立即购买
-		buy() {
-			let obj = this;
-			let data = {
-				cartNum: obj.goodsNumber, //商品数量
-				uniqueId: obj.uniqueId, //商品标签
-				new: '1', //商品是否新增加到购物车1为不加入0为加入
-				mer_id: obj.shopId
-				// type: 0,//0为余额支付  1为消费券支付 2为积分支付
-			};
-			if (obj.type == 2) {
-				data.new = 0;
-			}
-			if (obj.goodsType == 0) {
-				data.productId = obj.goodsid; //商品编号
-			}
-			// 判断是否为秒杀商品
-			if (obj.goodsType == 1) {
-				data.secKillId = obj.goodsid; //秒杀商品编号
-				data.productId = obj.goodsObjact.product_id; //商品编号
-				// 判断是否秒杀已经结束
-				if (obj.seckillObj.stop) {
-					uni.showModal({
-						title: '提示',
-						content: '当前活动已经结束',
-						showCancel: false
-					});
-					return;
+				item.check = true;
+				this.specSelected[ind] = item.attr;
+				let str = this.specSelected.join(',');
+				this.specSelectedName = this.specSelected.join(' ');
+				console.log(this.productValue, str);
+				if (this.productValue[str]) {
+					let data = this.productValue[str];
+					this.actionIntegral = data.integral;
+					this.actionPrice = data.price;
+					this.goodsNumberMax = data.stock;
+					this.actionImage = data.image;
+					this.uniqueId = data.unique;
 				}
-			}
-			// 判断是否为拼团商品
-			if (obj.goodsType == 2) {
-				data.combinationId = obj.goodsid; //拼团编号
-				data.productId = obj.goodsObjact.product_id; //商品编号
-			}
-			cartAdd(data)
-				.then(function({ data }) {
-					if (obj.type == 1) {
-						// 跳转到支付页
-						uni.navigateTo({
-							url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj.goodsType
+			},
+			//分享
+			share() {
+				this.$refs.share.toggleMask();
+			},
+			//收藏
+			toFavorite(item) {
+				let obj = this;
+				item.userCollect = !item.userCollect;
+				if (!item.userCollect) {
+					collectDel({
+						id: obj.goodsid,
+						category: 'product'
+					}).then(function(e) {
+						uni.showToast({
+							title: '成功取消收藏',
+							type: 'top',
+							duration: 1500
 						});
-					}
-					if (obj.type == 2) {
+					});
+				} else {
+					collectAdd({
+						id: obj.goodsid,
+						category: 'product'
+					}).then(function(e) {
 						uni.showToast({
-							title: '成功加入购物车',
+							title: '成功加入收藏',
 							type: 'top',
-							duration: 2000
+							duration: 1500
+						});
+					});
+				}
+			},
+			// 立即购买
+			buy() {
+				let obj = this;
+				let data = {
+					cartNum: obj.goodsNumber, //商品数量
+					uniqueId: obj.uniqueId, //商品标签
+					new: '1', //商品是否新增加到购物车1为不加入0为加入
+					mer_id: obj.shopId
+					// type: 0,//0为余额支付  1为消费券支付 2为积分支付
+				};
+				if (obj.type == 2) {
+					data.new = 0;
+				}
+				if (obj.goodsType == 0) {
+					data.productId = obj.goodsid; //商品编号
+				}
+				// 判断是否为秒杀商品
+				if (obj.goodsType == 1) {
+					data.secKillId = obj.goodsid; //秒杀商品编号
+					data.productId = obj.goodsObjact.product_id; //商品编号
+					// 判断是否秒杀已经结束
+					if (obj.seckillObj.stop) {
+						uni.showModal({
+							title: '提示',
+							content: '当前活动已经结束',
+							showCancel: false
 						});
-						obj.toggleSpec();
+						return;
 					}
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		stopPrevent() {}
-	}
-};
+				}
+				// 判断是否为拼团商品
+				if (obj.goodsType == 2) {
+					data.combinationId = obj.goodsid; //拼团编号
+					data.productId = obj.goodsObjact.product_id; //商品编号
+				}
+				cartAdd(data)
+					.then(function({
+						data
+					}) {
+						if (obj.type == 1) {
+							// 跳转到支付页
+							uni.navigateTo({
+								url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj
+									.goodsType
+							});
+						}
+						if (obj.type == 2) {
+							uni.showToast({
+								title: '成功加入购物车',
+								type: 'top',
+								duration: 2000
+							});
+							obj.toggleSpec();
+						}
+					})
+					.catch(e => {
+						console.log(e);
+					});
+			},
+			stopPrevent() {}
+		}
+	};
 </script>
 
 <style lang="scss">
-page {
-	background: $page-color-base;
-}
-//秒杀底部高度
-.seckillBottom {
-	height: 110rpx;
-}
-// 文章页底部高度撑开
-.contentBottomHeight {
-	height: 110rpx;
-}
-//默认商品底部高度
-.goodsBottom {
-	height: 160rpx;
-}
-.iconenter {
-	font-size: $font-base + 2rpx;
-	color: #888;
-}
-.carousel {
-	/* #ifdef APP-PLUS */
-	padding-top: var(--status-bar-height);
-	/* #endif */
-	height: 722rpx;
-	position: relative;
-	swiper {
-		height: 100%;
-	}
-	.image-wrapper {
-		width: 100%;
-		height: 100%;
-	}
-	.swiper-item {
-		display: flex;
-		justify-content: center;
-		align-content: center;
-		// height: 750rpx;
-		height: 710rpx;
-		overflow: hidden;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-// 秒杀
-.seckill-box-title {
-	background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%) !important;
-	.price,
-	.price-tip,
-	.timeStop,
-	.m-price {
-		color: #ffffff !important;
+	page {
+		background: $page-color-base;
 	}
-	.price-tip {
-		font-size: $font-base;
+
+	//秒杀底部高度
+	.seckillBottom {
+		height: 110rpx;
 	}
-	.price {
-		font-size: 40rpx !important;
-		font-weight: bold;
+
+	// 文章页底部高度撑开
+	.contentBottomHeight {
+		height: 110rpx;
 	}
-	.timeStop {
+
+	//默认商品底部高度
+	.goodsBottom {
+		height: 160rpx;
 	}
-}
-// 底部拼团、秒杀支付按钮
-.goods-pay-box {
-	position: fixed;
-	left: 0;
-	bottom: 0;
-	z-index: 95;
-	width: 750rpx;
-	height: 100rpx;
-	line-height: 1;
-	color: #ffffff;
-	text-align: center;
-	font-size: $font-lg;
-	.bgLine {
-		background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%);
+
+	.iconenter {
+		font-size: $font-base + 2rpx;
+		color: #888;
 	}
-	// 拼团支付按钮
-	.goods-pay {
-		display: flex;
-		align-content: center;
-		flex-wrap: wrap;
-		justify-content: center;
-		.goods-buttom,
-		.goods-buttom-money {
+
+	.carousel {
+		/* #ifdef APP-PLUS */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		height: 722rpx;
+		position: relative;
+
+		swiper {
+			height: 100%;
+		}
+
+		.image-wrapper {
 			width: 100%;
+			height: 100%;
 		}
-		.goods-buttom-money {
-			font-size: $font-base;
+
+		.swiper-item {
+			display: flex;
+			justify-content: center;
+			align-content: center;
+			// height: 750rpx;
+			height: 710rpx;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
 		}
 	}
-	.goods-pay-stop,
-	.goods-pay {
-		padding: 15rpx 0;
-		height: 100%;
-		width: 100%;
-	}
-	.goods-pay-stop {
-		background: $color-gray;
-		line-height: 70rpx;
-	}
-}
-/* 标题简介 */
-.introduce-section {
-	background: #fff;
-	padding: 20rpx 30rpx;
-	.title {
-		font-size: 32rpx;
-		color: $font-color-dark;
-		height: 50rpx;
-		line-height: 50rpx;
-	}
-	.price-box {
-		display: flex;
-		align-items: baseline;
-		height: 64rpx;
-		padding: 10rpx 0;
-		font-size: 26rpx;
-		color: #fd3b39;
-	}
-	.price {
-		font-size: $font-lg + 2rpx;
-	}
-	.m-price {
-		margin: 0 12rpx;
-		color: $font-color-light;
-		text-decoration: line-through;
+
+	// 秒杀
+	.seckill-box-title {
+		background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%) !important;
+
+		.price,
+		.price-tip,
+		.timeStop,
+		.m-price {
+			color: #ffffff !important;
+		}
+
+		.price-tip {
+			font-size: $font-base;
+		}
+
+		.price {
+			font-size: 40rpx !important;
+			font-weight: bold;
+		}
+
+		.timeStop {}
 	}
-	.coupon-tip {
-		align-items: center;
-		padding: 4rpx 10rpx;
-		background: $uni-color-primary;
-		font-size: $font-sm;
-		color: #fff;
-		border-radius: 6rpx;
+
+	// 底部拼团、秒杀支付按钮
+	.goods-pay-box {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 95;
+		width: 750rpx;
+		height: 100rpx;
 		line-height: 1;
-		transform: translateY(-4rpx);
-	}
-	.bot-row {
-		display: flex;
-		align-items: center;
-		height: 50rpx;
-		font-size: $font-sm;
-		color: $font-color-light;
-		text {
-			flex: 1;
+		color: #ffffff;
+		text-align: center;
+		font-size: $font-lg;
+
+		.bgLine {
+			background: linear-gradient(90deg, rgba(239, 78, 81, 1) 0%, rgba(244, 113, 59, 1) 100%);
+		}
+
+		// 拼团支付按钮
+		.goods-pay {
+			display: flex;
+			align-content: center;
+			flex-wrap: wrap;
+			justify-content: center;
+
+			.goods-buttom,
+			.goods-buttom-money {
+				width: 100%;
+			}
+
+			.goods-buttom-money {
+				font-size: $font-base;
+			}
+		}
+
+		.goods-pay-stop,
+		.goods-pay {
+			padding: 15rpx 0;
+			height: 100%;
+			width: 100%;
+		}
+
+		.goods-pay-stop {
+			background: $color-gray;
+			line-height: 70rpx;
 		}
 	}
-}
-/* 分享 */
-.share-section {
-	display: flex;
-	align-items: center;
-	color: $font-color-base;
-	background: linear-gradient(left, #fdf5f6, #fbebf6);
-	padding: 12rpx 30rpx;
-	.share-icon {
-		display: flex;
-		align-items: center;
-		width: 70rpx;
-		height: 30rpx;
-		line-height: 1;
-		border: 1px solid $uni-color-primary;
-		border-radius: 4rpx;
-		position: relative;
-		overflow: hidden;
-		font-size: 22rpx;
-		color: $uni-color-primary;
-		&:after {
-			content: '';
-			width: 50rpx;
+
+	/* 标题简介 */
+	.introduce-section {
+		background: #fff;
+		padding: 20rpx 30rpx;
+
+		.title {
+			font-size: 32rpx;
+			color: $font-color-dark;
 			height: 50rpx;
-			border-radius: 50%;
-			left: -20rpx;
-			top: -12rpx;
-			position: absolute;
+			line-height: 50rpx;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: baseline;
+			height: 64rpx;
+			padding: 10rpx 0;
+			font-size: 26rpx;
+			color: #fd3b39;
+		}
+
+		.price {
+			font-size: $font-lg + 2rpx;
+		}
+
+		.m-price {
+			margin: 0 12rpx;
+			color: $font-color-light;
+			text-decoration: line-through;
+		}
+
+		.coupon-tip {
+			align-items: center;
+			padding: 4rpx 10rpx;
 			background: $uni-color-primary;
+			font-size: $font-sm;
+			color: #fff;
+			border-radius: 6rpx;
+			line-height: 1;
+			transform: translateY(-4rpx);
+		}
+
+		.bot-row {
+			display: flex;
+			align-items: center;
+			height: 50rpx;
+			font-size: $font-sm;
+			color: $font-color-light;
+
+			text {
+				flex: 1;
+			}
 		}
 	}
-	.iconfavorfill {
-		position: relative;
-		z-index: 1;
-		font-size: 24rpx;
-		margin-left: 2rpx;
-		margin-right: 10rpx;
-		color: #fff;
-		line-height: 1;
-	}
-	.tit {
-		font-size: $font-base;
-		margin-left: 10rpx;
-	}
-	.iconprompt {
-		padding: 10rpx;
-		font-size: 30rpx;
-		line-height: 1;
-	}
-	.share-btn {
-		flex: 1;
-		text-align: right;
-		font-size: $font-sm;
-		color: $uni-color-primary;
-	}
-	.iconenter {
-		font-size: $font-sm;
-		margin-left: 4rpx;
-		color: $uni-color-primary;
-	}
-}
-
-.c-list {
-	margin-top: 20rpx;
-	font-size: $font-sm + 2rpx;
-	color: $font-color-base;
-	background: #fff;
-	.c-row {
+
+	/* 分享 */
+	.share-section {
 		display: flex;
 		align-items: center;
-		padding: 20rpx 30rpx;
-		position: relative;
-	}
-	.tit {
-		width: 140rpx;
-	}
-	.con {
-		flex: 1;
-		color: $font-color-dark;
-		.selected-text {
-			margin-right: 10rpx;
-			.num {
-				color: #fd3b39;
+		color: $font-color-base;
+		background: linear-gradient(left, #fdf5f6, #fbebf6);
+		padding: 12rpx 30rpx;
+
+		.share-icon {
+			display: flex;
+			align-items: center;
+			width: 70rpx;
+			height: 30rpx;
+			line-height: 1;
+			border: 1px solid $uni-color-primary;
+			border-radius: 4rpx;
+			position: relative;
+			overflow: hidden;
+			font-size: 22rpx;
+			color: $uni-color-primary;
+
+			&:after {
+				content: '';
+				width: 50rpx;
+				height: 50rpx;
+				border-radius: 50%;
+				left: -20rpx;
+				top: -12rpx;
+				position: absolute;
+				background: $uni-color-primary;
 			}
 		}
-	}
-	.bz-list {
-		height: 40rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
-		text {
-			display: inline-block;
-			margin-right: 30rpx;
+
+		.iconfavorfill {
+			position: relative;
+			z-index: 1;
+			font-size: 24rpx;
+			margin-left: 2rpx;
+			margin-right: 10rpx;
+			color: #fff;
+			line-height: 1;
 		}
-	}
-	.con-list {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		color: $font-color-dark;
-		line-height: 40rpx;
-	}
-	.red {
-		color: $uni-color-primary;
-	}
-}
-
-/* 评价 */
-.eva-section {
-	display: flex;
-	flex-direction: column;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	margin-top: 16rpx;
-	.e-header {
-		display: flex;
-		align-items: center;
-		height: 70rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-light;
+
 		.tit {
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-			margin-right: 4rpx;
+			font-size: $font-base;
+			margin-left: 10rpx;
+		}
+
+		.iconprompt {
+			padding: 10rpx;
+			font-size: 30rpx;
+			line-height: 1;
 		}
-		.tip {
+
+		.share-btn {
 			flex: 1;
 			text-align: right;
+			font-size: $font-sm;
+			color: $uni-color-primary;
 		}
+
 		.iconenter {
-			margin-left: 10rpx;
+			font-size: $font-sm;
+			margin-left: 4rpx;
+			color: $uni-color-primary;
 		}
 	}
-}
-.eva-box {
-	display: flex;
-	padding: 20rpx 0;
-	.portrait {
-		flex-shrink: 0;
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 100px;
-	}
-	.right {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base;
+
+	.c-list {
+		margin-top: 20rpx;
+		font-size: $font-sm + 2rpx;
 		color: $font-color-base;
-		padding-left: 26rpx;
+		background: #fff;
+
+		.c-row {
+			display: flex;
+			align-items: center;
+			padding: 20rpx 30rpx;
+			position: relative;
+		}
+
+		.tit {
+			width: 140rpx;
+		}
+
 		.con {
-			font-size: $font-base;
+			flex: 1;
 			color: $font-color-dark;
-			padding: 20rpx 0;
+
+			.selected-text {
+				margin-right: 10rpx;
+
+				.num {
+					color: #fd3b39;
+				}
+			}
+		}
+
+		.bz-list {
+			height: 40rpx;
+			font-size: $font-sm + 2rpx;
+			color: $font-color-dark;
+
+			text {
+				display: inline-block;
+				margin-right: 30rpx;
+			}
 		}
-		.bot {
+
+		.con-list {
+			flex: 1;
 			display: flex;
-			justify-content: space-between;
-			font-size: $font-sm;
-			color: $font-color-light;
+			flex-direction: column;
+			color: $font-color-dark;
+			line-height: 40rpx;
+		}
+
+		.red {
+			color: $uni-color-primary;
 		}
 	}
-}
-
-.eva-boxs {
-	width: 100%;
-	overflow: hidden;
-	padding: 10px 28rpx;
-	background: #f4f4f4;
-	border-radius: 12rpx;
-	font-size: $font-sm + 2rpx;
-	color: #333;
-	.portrait {
-		flex-shrink: 0;
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 100px;
-	}
-	.right {
-		flex: 1;
+
+	/* 评价 */
+	.eva-section {
 		display: flex;
 		flex-direction: column;
-		font-size: $font-base;
-		color: $font-color-base;
-		.con {
-			font-size: $font-base;
-			color: $font-color-dark;
-		}
-		.bot {
+		padding: 20rpx 30rpx;
+		background: #fff;
+		margin-top: 16rpx;
+
+		.e-header {
 			display: flex;
-			justify-content: space-between;
-			font-size: $font-sm;
+			align-items: center;
+			height: 70rpx;
+			font-size: $font-sm + 2rpx;
 			color: $font-color-light;
+
+			.tit {
+				font-size: $font-base + 2rpx;
+				color: $font-color-dark;
+				margin-right: 4rpx;
+			}
+
+			.tip {
+				flex: 1;
+				text-align: right;
+			}
+
+			.iconenter {
+				margin-left: 10rpx;
+			}
 		}
 	}
-}
-/*  详情 */
-.detail-desc {
-	background: #fff;
-	margin-top: 16rpx;
-	/deep/ img {
-		max-width: 100% !important;
-		display: inline !important;
-	}
-	/deep/ div {
-		max-width: 100% !important;
-	}
-	.d-header {
+
+	.eva-box {
 		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 80rpx;
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-		position: relative;
+		padding: 20rpx 0;
 
-		text {
-			padding: 0 20rpx;
-			background: #fff;
-			position: relative;
-			z-index: 1;
+		.portrait {
+			flex-shrink: 0;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100px;
 		}
-		&:after {
-			position: absolute;
-			left: 50%;
-			top: 50%;
-			transform: translateX(-50%);
-			width: 300rpx;
-			height: 0;
-			content: '';
-			border-bottom: 1px solid #ccc;
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-base;
+			color: $font-color-base;
+			padding-left: 26rpx;
+
+			.con {
+				font-size: $font-base;
+				color: $font-color-dark;
+				padding: 20rpx 0;
+			}
+
+			.bot {
+				display: flex;
+				justify-content: space-between;
+				font-size: $font-sm;
+				color: $font-color-light;
+			}
 		}
 	}
-}
 
-/* 规格选择弹窗 */
-.attr-content {
-	padding: 10rpx 0 0;
-	.a-t {
-		padding: 0 30rpx;
-		display: flex;
-		image {
-			width: 170rpx;
-			height: 170rpx;
+	.eva-boxs {
+		width: 100%;
+		overflow: hidden;
+		padding: 10px 28rpx;
+		background: #f4f4f4;
+		border-radius: 12rpx;
+		font-size: $font-sm + 2rpx;
+		color: #333;
+
+		.portrait {
 			flex-shrink: 0;
-			border-radius: 8rpx;
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 100px;
 		}
+
 		.right {
+			flex: 1;
 			display: flex;
 			flex-direction: column;
-			padding-left: 24rpx;
-			font-size: $font-sm + 2rpx;
+			font-size: $font-base;
 			color: $font-color-base;
-			line-height: 42rpx;
-			.good-name {
-				padding-top: 20rpx;
-				max-width: 320rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #1d2023;
-				line-height: 42rpx;
-				margin-bottom: 15rpx;
-			}
-			.price {
-				font-size: 40rpx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #ff6f0f;
-				// font-size: $font-lg;
-				// color: $uni-color-primary;
-				// margin-bottom: 10rpx;
+
+			.con {
+				font-size: $font-base;
+				color: $font-color-dark;
 			}
-			.selected-text {
-				margin-right: 10rpx;
+
+			.bot {
+				display: flex;
+				justify-content: space-between;
+				font-size: $font-sm;
+				color: $font-color-light;
 			}
 		}
 	}
-	.attr-list {
-		display: flex;
-		flex-direction: column;
-		font-size: $font-base + 2rpx;
-		color: $font-color-base;
-		padding-top: 30rpx;
-		padding-left: 40rpx;
-		padding-right: 30rpx;
-	}
-	.item-list {
-		padding: 20rpx 0 0;
-		display: flex;
-		flex-wrap: wrap;
-		.tit {
+
+	/*  详情 */
+	.detail-desc {
+		background: #fff;
+		margin-top: 16rpx;
+
+		/deep/ img {
+			max-width: 100% !important;
+			display: inline !important;
+		}
+
+		/deep/ div {
+			max-width: 100% !important;
+		}
+
+		.d-header {
 			display: flex;
-			align-items: center;
 			justify-content: center;
-			background: #eee;
-			// margin-left: 10rpx;
-			margin-right: 20rpx;
-			margin-bottom: 20rpx;
-			border-radius: 100rpx;
-			min-width: 60rpx;
-			height: 60rpx;
-			padding: 0 20rpx;
-			font-size: $font-base;
+			align-items: center;
+			height: 80rpx;
+			font-size: $font-base + 2rpx;
 			color: $font-color-dark;
-		}
-		.selected {
-			background: #fbebee;
-			color: $uni-color-primary;
+			position: relative;
+
+			text {
+				padding: 0 20rpx;
+				background: #fff;
+				position: relative;
+				z-index: 1;
+			}
+
+			&:after {
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translateX(-50%);
+				width: 300rpx;
+				height: 0;
+				content: '';
+				border-bottom: 1px solid #ccc;
+			}
 		}
 	}
-}
-
-/*  弹出层 */
-.popup {
-	position: fixed;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	z-index: 99;
-
-	&.show {
-		display: block;
-		.mask {
-			animation: showPopup 0.2s linear both;
-		}
-		.layer {
-			animation: showLayer 0.2s linear both;
+
+	/* 规格选择弹窗 */
+	.attr-content {
+		padding: 10rpx 0 0;
+
+		.a-t {
+			padding: 0 30rpx;
+			display: flex;
+
+			image {
+				width: 170rpx;
+				height: 170rpx;
+				flex-shrink: 0;
+				border-radius: 8rpx;
+			}
+
+			.right {
+				display: flex;
+				flex-direction: column;
+				padding-left: 24rpx;
+				font-size: $font-sm + 2rpx;
+				color: $font-color-base;
+				line-height: 42rpx;
+
+				.good-name {
+					padding-top: 20rpx;
+					max-width: 320rpx;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #1d2023;
+					line-height: 42rpx;
+					margin-bottom: 15rpx;
+				}
+
+				.price {
+					font-size: 40rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #ff6f0f;
+					// font-size: $font-lg;
+					// color: $uni-color-primary;
+					// margin-bottom: 10rpx;
+				}
+
+				.selected-text {
+					margin-right: 10rpx;
+				}
+			}
 		}
-	}
-	&.hide {
-		.mask {
-			animation: hidePopup 0.2s linear both;
+
+		.attr-list {
+			display: flex;
+			flex-direction: column;
+			font-size: $font-base + 2rpx;
+			color: $font-color-base;
+			padding-top: 30rpx;
+			padding-left: 40rpx;
+			padding-right: 30rpx;
 		}
-		.layer {
-			animation: hideLayer 0.2s linear both;
+
+		.item-list {
+			padding: 20rpx 0 0;
+			display: flex;
+			flex-wrap: wrap;
+
+			.tit {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background: #eee;
+				// margin-left: 10rpx;
+				margin-right: 20rpx;
+				margin-bottom: 20rpx;
+				border-radius: 100rpx;
+				min-width: 60rpx;
+				height: 60rpx;
+				padding: 0 20rpx;
+				font-size: $font-base;
+				color: $font-color-dark;
+			}
+
+			.selected {
+				background: #fbebee;
+				color: $uni-color-primary;
+			}
 		}
 	}
-	&.none {
-		display: none;
-	}
-	.mask {
+
+	/*  弹出层 */
+	.popup {
 		position: fixed;
+		left: 0;
 		top: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 1;
-		background-color: rgba(0, 0, 0, 0.4);
-	}
-	.layer {
-		position: fixed;
-		z-index: 99;
+		right: 0;
 		bottom: 0;
-		width: 100%;
-		min-height: 30vh;
-		border-radius: 10rpx 10rpx 0 0;
-		background-color: #fff;
-		.btn {
-			position: absolute;
-			bottom: 0;
-			width: 750rpx;
-			height: 98rpx;
-			background: #fe5b38;
-			line-height: 98rpx;
-			// background: $uni-color-primary;
-			font-size: $font-base + 2rpx;
-			color: #fff;
+		z-index: 99;
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
 		}
-	}
-	@keyframes showPopup {
-		0% {
-			opacity: 0;
+
+		&.hide {
+			.mask {
+				animation: hidePopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
 		}
-		100% {
-			opacity: 1;
+
+		&.none {
+			display: none;
 		}
-	}
-	@keyframes hidePopup {
-		0% {
-			opacity: 1;
+
+		.mask {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 1;
+			background-color: rgba(0, 0, 0, 0.4);
 		}
-		100% {
-			opacity: 0;
+
+		.layer {
+			position: fixed;
+			z-index: 99;
+			bottom: 0;
+			width: 100%;
+			min-height: 30vh;
+			border-radius: 10rpx 10rpx 0 0;
+			background-color: #fff;
+
+			.btn {
+				position: absolute;
+				bottom: 0;
+				width: 750rpx;
+				height: 98rpx;
+				background: #fe5b38;
+				line-height: 98rpx;
+				// background: $uni-color-primary;
+				font-size: $font-base + 2rpx;
+				color: #fff;
+			}
 		}
-	}
-	@keyframes showLayer {
-		0% {
-			transform: translateY(120%);
+
+		@keyframes showPopup {
+			0% {
+				opacity: 0;
+			}
+
+			100% {
+				opacity: 1;
+			}
 		}
-		100% {
-			transform: translateY(0%);
+
+		@keyframes hidePopup {
+			0% {
+				opacity: 1;
+			}
+
+			100% {
+				opacity: 0;
+			}
 		}
-	}
-	@keyframes hideLayer {
-		0% {
-			transform: translateY(0);
+
+		@keyframes showLayer {
+			0% {
+				transform: translateY(120%);
+			}
+
+			100% {
+				transform: translateY(0%);
+			}
 		}
-		100% {
-			transform: translateY(120%);
+
+		@keyframes hideLayer {
+			0% {
+				transform: translateY(0);
+			}
+
+			100% {
+				transform: translateY(120%);
+			}
 		}
 	}
-}
-
-/* 底部操作菜单 */
-.page-bottom {
-	position: fixed;
-	left: 0rpx;
-	bottom: 0rpx;
-	z-index: 95;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 750rpx;
-	height: 98rpx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
-	// border-radius: 16rpx;
-	.p-b-btn {
+
+	/* 底部操作菜单 */
+	.page-bottom {
+		position: fixed;
+		left: 0rpx;
+		bottom: 0rpx;
+		z-index: 95;
 		display: flex;
-		flex-direction: column;
-		align-items: center;
 		justify-content: center;
-		font-size: $font-sm;
-		color: $font-color-base;
-		width: 100rpx;
-		height: 98rpx;
-		.iconfont {
-			font-size: 40rpx;
-			line-height: 48rpx;
-			color: $font-color-light;
-		}
-		&.active,
-		&.active .iconfont {
-			color: $uni-color-primary;
-		}
-		.icon-fenxiang2 {
-			font-size: 42rpx;
-			transform: translateY(-2rpx);
-		}
-		.iconlikefill {
-			font-size: 46rpx;
-		}
-	}
-	.action-btn-group {
-		display: flex;
+		align-items: center;
+		width: 750rpx;
 		height: 98rpx;
-		// border-radius: 100px;
-		overflow: hidden;
-		// margin-left: 20rpx;
-		position: relative;
-		// &:after {
-		// 	content: '';
-		// 	position: absolute;
-		// 	top: 50%;
-		// 	right: 50%;
-		// 	transform: translateY(-50%);
-		// 	height: 28rpx;
-		// 	width: 0;
-		// 	border-right: 1px solid rgba(255, 255, 255, 0.5);
-		// }
-		.action-btn {
+		background: rgba(255, 255, 255, 0.9);
+		box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
+
+		// border-radius: 16rpx;
+		.p-b-btn {
 			display: flex;
+			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			width: 750rpx;
-			height: 100%;
-			font-size: 34rpx;
-			padding: 0;
-			border-radius: 0;
-			// background: transparent;
-			background: #ffb238;
-			&.buy-now-btn {
-				background-color: #ffb238;
+			font-size: $font-sm;
+			color: $font-color-base;
+			width: 100rpx;
+			height: 98rpx;
+
+			.iconfont {
+				font-size: 40rpx;
+				line-height: 48rpx;
+				color: $font-color-light;
+			}
+
+			&.active,
+			&.active .iconfont {
+				color: $uni-color-primary;
+			}
+
+			.icon-fenxiang2 {
+				font-size: 42rpx;
+				transform: translateY(-2rpx);
 			}
-			&.add-cart-btn {
-				background: #fd3b39;
+
+			.iconlikefill {
+				font-size: 46rpx;
+			}
+		}
+
+		.action-btn-group {
+			display: flex;
+			height: 98rpx;
+			// border-radius: 100px;
+			overflow: hidden;
+			// margin-left: 20rpx;
+			position: relative;
+
+			// &:after {
+			// 	content: '';
+			// 	position: absolute;
+			// 	top: 50%;
+			// 	right: 50%;
+			// 	transform: translateY(-50%);
+			// 	height: 28rpx;
+			// 	width: 0;
+			// 	border-right: 1px solid rgba(255, 255, 255, 0.5);
+			// }
+			.action-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 750rpx;
+				height: 100%;
+				font-size: 34rpx;
+				padding: 0;
+				border-radius: 0;
+				// background: transparent;
+				background: #ffb238;
+
+				&.buy-now-btn {
+					background-color: #ffb238;
+				}
+
+				&.add-cart-btn {
+					background: #fd3b39;
+				}
 			}
 		}
 	}
-}
-// 商店头
-.shop-box {
-	background-color: #ffffff;
-	margin-top: 20rpx;
-	margin-bottom: 10rpx;
-	padding: 20rpx;
-	.shop-img {
-		border-radius: 300rpx;
-		height: 80rpx;
-		width: 80rpx;
-		margin-right: 20rpx;
-	}
-	.shop-button {
-		border-radius: 100rpx;
-		padding: 10rpx 20rpx;
-		color: $color-red;
-		border: 1px solid $color-red;
-		font-size: $font-lg;
-		line-height: 1;
+
+	// 商店头
+	.shop-box {
+		background-color: #ffffff;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
+		padding: 20rpx;
+
+		.shop-img {
+			border-radius: 300rpx;
+			height: 80rpx;
+			width: 80rpx;
+			margin-right: 20rpx;
+		}
+
+		.shop-button {
+			border-radius: 100rpx;
+			padding: 10rpx 20rpx;
+			color: $color-red;
+			border: 1px solid $color-red;
+			font-size: $font-lg;
+			line-height: 1;
+		}
 	}
-}
-</style>
+</style>

BIN
unpackage/cache/apk/__UNI__9A7699F_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/506065d0-033c-11ee-ad9a-530e5f5c748e
+https://ide.dcloud.net.cn/build/download/c593e940-4709-11ee-9d94-d50304abc87c

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/google-keystore.keystore → unpackage/cache/wgt/__UNI__9A7699F/.manifest/google-keystore.keystore


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/icon-android-hdpi.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-hdpi.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/icon-android-xhdpi.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xhdpi.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/icon-android-xxhdpi.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xxhdpi.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/icon-android-xxxhdpi.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/icon-android-xxxhdpi.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/splash-android-hdpi.9.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-hdpi.9.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/splash-android-xhdpi.9.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-xhdpi.9.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/.manifest/splash-android-xxhdpi.9.png → unpackage/cache/wgt/__UNI__9A7699F/.manifest/splash-android-xxhdpi.9.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappchooselocation.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappchooselocation.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniapperror.png → unpackage/cache/wgt/__UNI__9A7699F/__uniapperror.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappes6.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappes6.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappopenlocation.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappopenlocation.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniapppicker.js → unpackage/cache/wgt/__UNI__9A7699F/__uniapppicker.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappquill.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappquill.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappquillimageresize.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappquillimageresize.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappscan.js → unpackage/cache/wgt/__UNI__9A7699F/__uniappscan.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappsuccess.png → unpackage/cache/wgt/__UNI__9A7699F/__uniappsuccess.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/__uniappview.html → unpackage/cache/wgt/__UNI__9A7699F/__uniappview.html


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__9A7699F/app-config-service.js


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/app-config.js → unpackage/cache/wgt/__UNI__9A7699F/app-config.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__9A7699F/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__9A7699F/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__9A7699F/manifest.json


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/css/cmy.css → unpackage/cache/wgt/__UNI__9A7699F/static/css/cmy.css


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/error/emptyCart.png → unpackage/cache/wgt/__UNI__9A7699F/static/error/emptyCart.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/error/errorImage.jpg → unpackage/cache/wgt/__UNI__9A7699F/static/error/errorImage.jpg


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/error/missing-face.png → unpackage/cache/wgt/__UNI__9A7699F/static/error/missing-face.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/appleIcon.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/appleIcon.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/bdjj.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/bdjj.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/btncz.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/btncz.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/call.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/call.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/dh.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/dh.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/dsjh.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/dsjh.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/dw.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/dw.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/fanhui.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/fanhui.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/fhsy.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/fhsy.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/gou.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/gou.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/guanbi@2x.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/guanbi@2x.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/i8.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/i8.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/index06.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/index06.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/index1.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/index1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/jindou.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/jindou.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n1.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n2.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n2.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n3.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n3.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n4.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n4.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n5.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n5.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n6.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n6.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n7.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n7.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/n8.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/n8.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/search-h.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/search-h.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/select.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/select.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/selected.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/selected.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/sh-log.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/sh-log.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/skxx.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/skxx.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tdjj.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tdjj.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/team.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/team.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/title-icon.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/title-icon.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-1.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-2.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-2.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-3.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-3.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-4.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-4.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-5.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-5.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/tool-6.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/tool-6.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/uset.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/uset.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/wenhao.png → unpackage/cache/wgt/__UNI__9A7699F/static/icon/wenhao.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/add.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/add.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/address.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/address.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/afternoon.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/afternoon.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/ali.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/ali.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/aliD.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/aliD.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/arc.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/arc.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/back.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/back.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/backb.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/backb.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/bank.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/bank.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/bankD.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/bankD.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/been.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/been.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/busy.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/busy.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/call.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/call.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/cart.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/cart.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/copy.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/copy.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/delete.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/delete.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/deletes.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/deletes.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/djs1.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/djs1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/download.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/download.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/evening.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/evening.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/eveningicon.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/eveningicon.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/fanhui.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/fanhui.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/gong.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/gong.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/gssy.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/gssy.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/hall-bg.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/hall-bg.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/hell-main1.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/hell-main1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/hinco.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/hinco.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/hinfo-bg1.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/hinfo-bg1.png


+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/static/img/img009.png → unpackage/cache/wgt/__UNI__9A7699F/static/img/img009.png


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