guhongwei 2 yıl önce
ebeveyn
işleme
0e7149ccb3

+ 50 - 50
common/css/font-icon.css

@@ -1,169 +1,169 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3674157 */
-  /* Color fonts */
-  src: 
-       url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff2?t=1665648026258') format('woff2'),
-       url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff?t=1665648026258') format('woff'),
-       url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.ttf?t=1665648026258') format('truetype');
+	font-family: "iconfont";
+	/* Project id 3674157 */
+	/* Color fonts */
+	src:
+		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff2?t=1665648026258') format('woff2'),
+		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.woff?t=1665648026258') format('woff'),
+		url('https://at.alicdn.com/t/c/font_3674157_otfqobpw55.ttf?t=1665648026258') format('truetype');
 }
 
 .iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+	font-family: "iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }
 
 .icon-top:before {
-  content: "\e606";
+	content: "\e606";
 }
 
 .icon-qianggou:before {
-  content: "\e619";
+	content: "\e619";
 }
 
 .icon-cantuan:before {
-  content: "\ec43";
+	content: "\ec43";
 }
 
 .icon-liebiaoxingshi:before {
-  content: "\e742";
+	content: "\e742";
 }
 
 .icon-shitugonggeListBox:before {
-  content: "\e7ca";
+	content: "\e7ca";
 }
 
 .icon-weixin:before {
-  content: "\e73b";
+	content: "\e73b";
 }
 
 .icon-duihao:before {
-  content: "\e684";
+	content: "\e684";
 }
 
 .icon-yduishoucangshixin-copy:before {
-  content: "\e8bf";
+	content: "\e8bf";
 }
 
 .icon-yduishoucangkongxin-copy:before {
-  content: "\e8c0";
+	content: "\e8c0";
 }
 
 .icon-yduishoucangkongxin:before {
-  content: "\e6ac";
+	content: "\e6ac";
 }
 
 .icon-yduishoucangshixin:before {
-  content: "\e6ad";
+	content: "\e6ad";
 }
 
 .icon-jiantouyou:before {
-  content: "\e62d";
+	content: "\e62d";
 }
 
 .icon-fenlei-copy:before {
-  content: "\e8bb";
+	content: "\e8bb";
 }
 
 .icon-shangpinfenlei-copy:before {
-  content: "\e8bc";
+	content: "\e8bc";
 }
 
 .icon-qiyejianjie-copy:before {
-  content: "\e8bd";
+	content: "\e8bd";
 }
 
 .icon-fenlei:before {
-  content: "\e605";
+	content: "\e605";
 }
 
 .icon-shangpinfenlei:before {
-  content: "\e62f";
+	content: "\e62f";
 }
 
 .icon-qiyejianjie:before {
-  content: "\e61d";
+	content: "\e61d";
 }
 
 .icon-gengduo:before {
-  content: "\e660";
+	content: "\e660";
 }
 
 .icon-shanchu:before {
-  content: "\e625";
+	content: "\e625";
 }
 
 .icon-dingweixiao:before {
-  content: "\e8ba";
+	content: "\e8ba";
 }
 
 .icon-shangdian-copy:before {
-  content: "\e8be";
+	content: "\e8be";
 }
 
 .icon-shangdian:before {
-  content: "\e67a";
+	content: "\e67a";
 }
 
 .icon-shangjiantou:before {
-  content: "\e603";
+	content: "\e603";
 }
 
 .icon-xiajiantou:before {
-  content: "\e604";
+	content: "\e604";
 }
 
 .icon-shangjiantou-copy:before {
-  content: "\e714";
+	content: "\e714";
 }
 
 .icon-xiajiantou-copy:before {
-  content: "\e715";
+	content: "\e715";
 }
 
 .icon-del-copy:before {
-  content: "\e716";
+	content: "\e716";
 }
 
 .icon-del:before {
-  content: "\e616";
+	content: "\e616";
 }
 
 .icon-fanhuidingbu:before {
-  content: "\e713";
+	content: "\e713";
 }
 
 .icon-gouwuche:before {
-  content: "\e628";
+	content: "\e628";
 }
 
 .icon-dayufuhao:before {
-  content: "\e62b";
+	content: "\e62b";
 }
 
 .icon-daifahuo:before {
-  content: "\e600";
+	content: "\e600";
 }
 
 .icon-daifukuan:before {
-  content: "\e601";
+	content: "\e601";
 }
 
 .icon-shouhoufuwuicon:before {
-  content: "\e633";
+	content: "\e633";
 }
 
 .icon-geren2:before {
-  content: "\e6bc";
+	content: "\e6bc";
 }
 
 .icon-daishouhuo:before {
-  content: "\e612";
+	content: "\e612";
 }
 
 .icon-daipinglun:before {
-  content: "\e602";
+	content: "\e602";
 }
-

+ 1 - 1
components/u-parse/u-parse.vue

@@ -36,7 +36,7 @@ export default {
     },
     noData: {
       type: String,
-      default: '<div style="color: red;">数据不能为空</div>',
+      default: '<div style="color: red;"></div>',
     },
     startHandler: {
       type: Function,

+ 1 - 1
config.js

@@ -2,7 +2,7 @@ export default {
 	serverUrl: 'https://broadcast.waityou24.cn',
 	// serverUrl: 'http://192.168.223.1:12111',
 	wx_projectkey: 'tnhqApp', //pointApp
-	share:{},
+	share: {},
 	china: [
 		//全国地址
 		{

+ 6 - 2
manifest.json

@@ -66,7 +66,11 @@
                     }
                 },
                 "oauth" : {
-                    "univerify" : {}
+                    "univerify" : {},
+                    "weixin" : {
+                        "appid" : "wx928648edf0df1882",
+                        "UniversalLinks" : ""
+                    }
                 },
                 "maps" : {
                     "amap" : {
@@ -141,7 +145,7 @@
         },
         "requiredPrivateInfos" : [ "chooseAddress", "chooseLocation" ], //getLocatio__UNI__B379F0E__UNI__B379F0E__UNI__B379F0E__UNI__B379F0En
         "plugins" : {},
-		"lazyCodeLoading": "requiredComponents"
+        "lazyCodeLoading" : "requiredComponents"
     },
     // "chooseLocation" : {
     //     "version" : "1.0.9",

+ 10 - 19
pages/home/index.vue

@@ -61,7 +61,7 @@
 							<view class="list" v-for="(item,index) in marketList" :key="index" @tap="toBuy(item)">
 								<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
 								</image>
-								<view class="name">
+								<view class="name textOver">
 									{{item.name}}
 								</view>
 								<view class="other">
@@ -77,9 +77,6 @@
 							</view>
 						</view>
 					</view>
-					<!-- 			<view class="is_bottom" v-if="is_bottom">
-						<text>我们也是有底线的!</text>
-					</view> -->
 				</view>
 			</view>
 		</scroll-view>
@@ -115,8 +112,6 @@
 				old: {
 					scrollTop: 0
 				},
-				// // 数据是否触底
-				// is_bottom: false,
 			};
 		},
 		onLoad: function() {},
@@ -464,19 +459,24 @@
 			padding: 2vw 0;
 
 			.five_pubu {
-				column-count: 2;
-				column-gap: 2vw;
+				// column-count: 2;
+				// column-gap: 2vw;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				padding: 0 2vw;
 
 				.list {
+					// break-inside: avoid;
+					width: 41vw;
 					background-color: var(--fffColor);
 					padding: 2vw;
 					margin: 0 0 2vw 0;
-					break-inside: avoid;
 					border-radius: 10px;
 
 					.image {
 						width: 100%;
-						height: 35vw;
+						height: 40vw;
 					}
 
 					.name {
@@ -549,13 +549,4 @@
 			border-radius: 90px;
 		}
 	}
-
-	.is_bottom {
-		text-align: center;
-
-		text {
-			padding: 1vw 0;
-			display: inline-block;
-		}
-	}
 </style>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 452 - 383
pages/login/index.vue


Dosya farkı çok büyük olduğundan ihmal edildi
+ 22 - 197
pages/other/agree.vue


+ 34 - 7
pagesHome/market/search.vue

@@ -37,7 +37,7 @@
 									<view class="sale" v-if="item.is_sale==true">
 										<text>已售尽</text>
 									</view>
-									<view class="name">
+									<view class="name textOver">
 										{{item.name}}
 									</view>
 									<view class="other">
@@ -59,7 +59,7 @@
 				</scroll-view>
 			</view>
 			<view class="is_bottom" v-if="is_bottom">
-				<text>我们也是有底线的!</text>
+				<text>{{config.bottom_title}}</text>
 			</view>
 		</view>
 	</mobile-frame>
@@ -69,6 +69,8 @@
 	export default {
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				tags: '',
 				// 一级id
 				pid: '',
@@ -114,6 +116,7 @@
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
+				bottom_title: this.$config.bottom_title
 			};
 		},
 		onLoad: async function(e) {
@@ -123,7 +126,24 @@
 			await that.searchOther();
 			await that.search();
 		},
+		onShow: function() {
+			const that = this;
+			that.searchConfig();
+		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 选择二级
 			screenChange(e) {
 				const that = this;
@@ -317,7 +337,8 @@
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;
-					.uni-input{
+
+					.uni-input {
 						text-align: center;
 					}
 				}
@@ -330,15 +351,19 @@
 				background-color: var(--f1Color);
 
 				.pubu {
-					column-count: 2;
-					column-gap: 2vw;
+					// column-count: 2;
+					// column-gap: 2vw;
+					display: flex;
+					justify-content: space-between;
+					flex-wrap: wrap;
 
 					.list {
+						width: 43vw;
+						// break-inside: avoid;
 						position: relative;
 						background-color: var(--fffColor);
 						padding: 2vw;
 						margin: 0 0 2vw 0;
-						break-inside: avoid;
 						border-radius: 9px;
 
 						.image {
@@ -423,8 +448,10 @@
 		text-align: center;
 
 		text {
-			padding: 1vw 0;
+			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 49 - 44
pagesHome/shop/index.vue

@@ -12,7 +12,7 @@
 							<view class="pubu">
 								<view class="list" v-for="(item,index) in shoplist" :key="index">
 									<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
-									<view class="name">
+									<view class="name textOver">
 										{{item.name}}
 									</view>
 									<view class="other">
@@ -56,13 +56,12 @@
 								<view class="second_2">
 									<view class="pubu">
 										<view class="list" v-for="(item,index) in list" :key="index">
-											<image class="image"
-												:src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
+											<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode="">
 											</image>
 											<view class="sale" v-if="item.is_sale==true">
 												<text>已售尽</text>
 											</view>
-											<view class="name">
+											<view class="name textOver">
 												{{item.name}}
 											</view>
 											<view class="other">
@@ -78,7 +77,7 @@
 									</view>
 								</view>
 								<view class="is_bottom" v-if="is_bottom">
-									<text>我们也是有底线的!</text>
+									<text>{{config.bottom_title}}</text>
 								</view>
 							</view>
 						</scroll-view>
@@ -143,6 +142,8 @@
 	export default {
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				user: {},
 				id: '',
 				barActive: '0',
@@ -214,12 +215,32 @@
 		},
 		onLoad: async function(e) {
 			const that = this;
-			that.$set(that, `id`, e.id || '');
+			let id = '6333d71d32c5f69745f9bd32';
+			if (e && e.id) id = e.id;
+			else id = decodeURIComponent(e.q).split('id=')[1];
+			that.$set(that, `id`, id);
 			await that.watchLogin();
 			await that.search();
 			await that.searchOther();
 		},
+		onShow: function() {
+			const that = this;
+			that.searchConfig();
+		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 监听用户是否登录
 			watchLogin() {
 				const that = this;
@@ -466,15 +487,20 @@
 					padding: 0 2vw 2vw 2vw;
 
 					.pubu {
-						column-count: 2;
-						column-gap: 2vw;
+						// column-count: 2;
+						// column-gap: 2vw;
+						display: flex;
+						justify-content: space-between;
+						flex-wrap: wrap;
 
 						.list {
+							// break-inside: avoid;
+							width: 43vw;
 							background: #fff;
 							padding: 2vw;
 							border-radius: 5px;
 							margin: 0 0 2vw 0;
-							break-inside: avoid;
+
 
 							.image {
 								width: 100%;
@@ -647,16 +673,21 @@
 						background-color: var(--f1Color);
 
 						.pubu {
-							column-count: 2;
-							column-gap: 2vw;
+							// column-count: 2;
+							// column-gap: 2vw;
+							display: flex;
+							justify-content: space-between;
+							flex-wrap: wrap;
 
 							.list {
+								// break-inside: avoid;
+								width: 43vw;
 								position: relative;
 								margin: 0 0 2vw 0;
 								padding: 2vw;
 								border-radius: 10px;
 								background-color: var(--fffColor);
-								break-inside: avoid;
+
 
 								.image {
 									width: 100%;
@@ -772,7 +803,7 @@
 
 						.uqrcode {
 							top: 10vw;
-							left: 23%;
+							left: 20%;
 
 						}
 
@@ -783,35 +814,7 @@
 							width: 100vw;
 							bottom: -22vw;
 						}
-						// display: flex;
-						// justify-content: center;
-						// text-align: center;
-						// margin: 5vw 0;
-
-						// .qrcode_1_1 {
-						// 	padding: 2vw;
-
-						// .uqrcode {
-						// 	display: flex;
-						// 	justify-content: center;
-						// 	width: 216px !important;
-						// 	height: 216px !important;
-
-						// 	.uqrcode-canvas {
-						// 		-webkit-transform-origin: center;
-						// 	}
-						// }
-
-						// canvas {
-						// 	width: 180px !important;
-						// 	height: 180px !important;
-						// }
-
-						// .txt {
-						// 	margin: 2vw 0 0 0;
-						// 	color: #000;
-						// }
-						// }
+
 					}
 
 				}
@@ -866,12 +869,14 @@
 	}
 
 	.is_bottom {
-		width: 100%;
 		text-align: center;
+		width: 100%;
 
 		text {
-			padding: 1vw 0;
+			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 22 - 2
pagesMy/address/index.vue

@@ -32,7 +32,7 @@
 							</view>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
-							<text>我们也是有底线的!</text>
+							<text>{{config.bottom_title}}</text>
 						</view>
 					</view>
 				</scroll-view>
@@ -53,6 +53,8 @@
 	export default {
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				user: {},
 				list: [],
 				total: 0,
@@ -66,9 +68,25 @@
 		},
 		onShow: function() {
 			const that = this;
-			that.watchLogin()
+			that.searchConfig();
+			that.watchLogin();
+
 		},
+
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 监听用户是否登录
 			watchLogin() {
 				const that = this;
@@ -376,6 +394,8 @@
 		text {
 			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 19 - 1
pagesMy/discount/index.vue

@@ -6,7 +6,7 @@
 					<view class="list-scroll-view">
 						<discount :Style="Style" :couponList="list"></discount>
 						<view class="is_bottom" v-if="is_bottom">
-							<text>我们也是有底线的!</text>
+							<text>{{config.bottom_title}}</text>
 						</view>
 					</view>
 				</scroll-view>
@@ -23,6 +23,8 @@
 		},
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				Style: {
 					status: true
 				},
@@ -39,10 +41,24 @@
 		},
 		onLoad: function(e) {
 			const that = this;
+			that.searchConfig();
 			// 监听用户是否登录
 			that.watchLogin();
 		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 监听用户是否登录
 			watchLogin() {
 				const that = this;
@@ -143,6 +159,8 @@
 		text {
 			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 28 - 1
pagesMy/order/after.vue

@@ -49,7 +49,7 @@
 									</view>
 								</view>
 								<view class="is_bottom" v-if="is_bottom">
-									<text>我们也是有底线的!</text>
+									<text>{{config.bottom_title}}</text>
 								</view>
 							</view>
 						</scroll-view>
@@ -68,6 +68,8 @@
 		},
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				user: {},
 				list: [],
 				typeList: [],
@@ -111,6 +113,7 @@
 		},
 		onShow: async function() {
 			const that = this;
+			that.searchConfig();
 			that.clearPage();
 			// 查询其他信息
 			await that.searchOther();
@@ -118,6 +121,19 @@
 			await that.watchLogin();
 		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 选择选项卡
 			tabsChange(e) {
 				const that = this;
@@ -362,4 +378,15 @@
 			flex-direction: column;
 		}
 	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: #858585;
+			font-size: 14px;
+		}
+	}
 </style>

+ 19 - 1
pagesMy/order/index.vue

@@ -114,7 +114,7 @@
 									</view>
 								</view>
 								<view class="is_bottom" v-if="is_bottom">
-									<text>我们也是有底线的!</text>
+									<text>{{config.bottom_title}}</text>
 								</view>
 							</view>
 						</scroll-view>
@@ -133,6 +133,8 @@
 		},
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				user: {},
 				status: '',
 				searchInfo: {},
@@ -183,10 +185,24 @@
 		},
 		onShow: function() {
 			const that = this;
+			that.searchConfig();
 			that.clearPage();
 			that.search();
 		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			// 监听用户是否登录
 			watchLogin() {
 				const that = this;
@@ -757,6 +773,8 @@
 		text {
 			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 21 - 2
pagesRest/activity/info.vue

@@ -31,7 +31,7 @@
 									</view>
 								</view>
 								<view class="is_bottom" v-if="is_bottom">
-									<text>我们也是有底线的!</text>
+									<text>{{config.bottom_title}}</text>
 								</view>
 							</view>
 						</scroll-view>
@@ -60,6 +60,8 @@
 		},
 		data() {
 			return {
+				// 系统设置
+				config: {},
 				id: '',
 				barActive: '0',
 				barList: [ //底部菜单
@@ -95,9 +97,23 @@
 		},
 		onShow: function() {
 			const that = this;
+			that.searchConfig();
 			that.searchAct();
 		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			async searchAct() {
 				const that = this;
 				if (that.id) {
@@ -312,13 +328,16 @@
 		}
 	}
 
+
 	.is_bottom {
 		text-align: center;
 		width: 100vw;
 
 		text {
-			padding: 1vw 0;
+			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>

+ 15 - 1
pagesRest/activity/list.vue

@@ -20,7 +20,7 @@
 							</view>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
-							<text>我们也是有底线的!</text>
+							<text>{{config.bottom_title}}</text>
 						</view>
 					</view>
 				</scroll-view>
@@ -47,9 +47,23 @@
 		onLoad: function(e) {},
 		onShow: function() {
 			const that = this;
+			that.searchConfig();
 			that.search();
 		},
 		methods: {
+			// 查询基本设置
+			searchConfig() {
+				const that = this;
+				uni.getStorage({
+					key: 'config',
+					success: function(res) {
+						if (res.data) that.$set(that, `config`, res.data)
+					},
+					fail: function(err) {
+						console.log(err);
+					}
+				})
+			},
 			async search() {
 				const that = this;
 				let info = {

+ 15 - 9
pagesRest/recom/index.vue

@@ -10,14 +10,14 @@
 						<view class="list_1">
 							<image class="image" :src="item.file&&item.file.length>0?item.file[0].url:''" mode=""></image>
 						</view>
-						<view class="name">
+						<view class="name textOver">
 							{{item.name}}
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="is_bottom" v-if="is_bottom">
-				<text>我们也是有底线的!</text>
+				<text>{{config.bottom_title}}</text>
 			</view>
 		</view>
 	</mobile-frame>
@@ -36,7 +36,7 @@
 				topUrl: '',
 				// 数据列表
 				list: [],
-				is_bottom: true
+				is_bottom: false
 			};
 		},
 		onLoad(e) {
@@ -135,7 +135,7 @@
 			.image {
 				width: 100%;
 				height: 200px;
-				box-shadow: 0 0 5px #858585;
+				box-shadow: 0 0 5px #f1f1f1;
 				border-radius: 10px;
 			}
 		}
@@ -145,14 +145,17 @@
 			margin: 0 0 2vw 0;
 
 			.pubu {
-				column-count: 2;
-				column-gap: 3vw;
+				// column-count: 2;
+				// column-gap: 3vw;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
 
 				.list {
+					width: 43vw;
+					// break-inside: avoid;
 					margin: 0 0 2vw 0;
-					-webkit-column-break-inside: avoid;
-					break-inside: avoid;
-					box-shadow: 0 0 5px #858585;
+					box-shadow: 0 0 5px #f1f1f1;
 					padding: 2vw;
 					border-radius: 5px;
 
@@ -175,12 +178,15 @@
 		}
 	}
 
+
 	.is_bottom {
 		text-align: center;
 
 		text {
 			padding: 2vw 0;
 			display: inline-block;
+			color: #858585;
+			font-size: 14px;
 		}
 	}
 </style>