From 878bd7667a8af3506a7a41590e967a70e9447749 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Wed, 14 Jun 2023 01:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 androidPrivacy.json                  | 39 ++++++++++++++++++++++++++--
 pages/index/cart.vue                 |  8 ++++++
 pages/index/category/two-catgory.vue |  8 ++++--
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/androidPrivacy.json b/androidPrivacy.json
index 0d726ca..9dfb474 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,3 +1,38 @@
 {
-    "prompt" : "template"
-}
+  "version": "1.0.8",  
+  "prompt": "template",
+  "title": "服务协议和隐私政策",
+  "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+  "buttonAccept": "同意并接受",
+  "buttonRefuse": "暂不同意",
+  "hrefLoader": "system|default",
+  "backToExit":"false",
+  "second": {
+    "title": "确认提示",
+    "message": "　　进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
+    "buttonAccept": "同意并继续",
+    "buttonRefuse": "退出应用"
+  },
+  "disagreeMode":{
+    "support": false,
+    "loadNativePlugins": false,
+    "visitorEntry": true,
+    "showAlways": false 
+  },
+  "styles": {
+    "backgroundColor": "#ffffff",
+    "borderRadius":"5px",
+    "title": {
+      "color": "#333"
+    },
+    "buttonAccept": {
+      "color": "#08BF77"
+    },
+    "buttonRefuse": {
+      "color": "#333333"
+    }
+    // "buttonVisitor": {
+    //   "color": "#00ffff"
+    // }
+  }
+}
\ No newline at end of file
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index eb6ac42..974504f 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -228,6 +228,11 @@
 		padding: 40rpx 25rpx;
 		margin: 20rpx 24rpx;
 		border-radius: 20rpx;
+		width:100%;
+		//#ifdef MP
+		width:auto;
+		 // #endIf  
+		 
 		// 商品卡片包裹
 		.goods-wrap {
 			position: relative;
@@ -372,4 +377,7 @@
 			color: rgba(#fff, 0.9);
 		}
 	}
+	/deep/.u-checkbox-group{
+		width:100%;
+	}
 </style>
diff --git a/pages/index/category/two-catgory.vue b/pages/index/category/two-catgory.vue
index b37f67d..dfed9c6 100644
--- a/pages/index/category/two-catgory.vue
+++ b/pages/index/category/two-catgory.vue
@@ -49,7 +49,7 @@
 			<view style="height: 100%;width: 100%;">
 				<scroll-view scroll-y class="scroll-box" enable-back-to-top scroll-with-animation>
 					<view class="right" style="width: calc(100vw - 200rpx);" v-if="categoryData.length">
-						<image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" lazy-load mode="aspectFill"></image>
+						<!-- <image class="type-img" v-if="categoryData[listId].image" :src="categoryData[listId].image" lazy-load mode="aspectFill"></image> -->
 					<!-- 	<view class="type-box u-flex u-col-center u-row-center">
 							<view class="u-iconfont uicon-minus" style="color: #d3d3d3;font-size: 28rpx;"></view>
 							<text class="type-title">{{ categoryData[listId].name }}</text>
@@ -96,7 +96,9 @@ export default {
 	data() {
 		return {
 			listId: 0,
-			categoryData: [],
+			categoryData: [
+				
+			],
 			twoData:[],
 			options: [{
 				custom: true // 该栏目开启自定义模式
@@ -160,7 +162,9 @@ export default {
 				id: this.categoryStyleId
 			}).then(res => {
 				if (res.code === 1) {
+					
 					this.categoryData = res.data.children;
+					console.log(this.categoryData[this.listId],"iiiii",this.listId)
 					
 				}
 			});