修改部分样式

Signed-off-by: 罗超 <alex9012@vip.qq.com>

components/common/popup.vue

+<template>
+	<view @click="close" class="mask">
+		<view @click.stop="onClick" class="content">
+			<text class="text">点击蒙层关闭</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			onClick(e) {
+				uni.showToast({
+					title: "点击蒙层关闭"
+				})
+				// #ifdef APP-NVUE
+				e.stopPropagation()
+				// #endif
+			},
+			close() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+
+	.content {
+		width: 200px;
+		height: 200px;
+		background-color: #007AFF;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+</style>

components/empty/index.vue

 <template>
-  <view :style="st"></view>
+  <view :style="{'background':block.background,'height':block.height+'px'}"></view>
 </template>
 
 <script>
@@ -7,11 +7,11 @@ export default {
     props:['block'],
     data() {
         return {
-            st:''
+            st:{}
         }
     },
     created() {
-        this.st=`background:${this.block.background};height:${this.block.height}rpx`
+        this.st={'background':this.block.background,'height':this.block.height+'rpx'}
     },
 }
 </script>

components/gridnav/index.vue

@@ -16,7 +16,7 @@
               <image
                 :src="getIconLink(c.icon)"
                 mode="widthFix"
-                style="width: 88rpx; height: 88rpx;"
+                style="width: 64rpx; height: 64rpx;"
               />
               <text :style="{'color':navs.color}">{{ c.name }}</text>
             </u-grid-item>

components/rubik/index.vue

 <template>
   <view
     class="ad-box"
-    :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx' }"
+    :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',margin:marginStyle }"
   >
     <view
       class="ad-chi"
@@ -10,7 +10,7 @@
       :style="[item.formatStyle]"
       @click="clickHandler(item.link[0].new_link_url)"
     >
-      <img :src="item.pic_url" mode="widthFix"/>
+      <img :src="item.pic_url" style="margin-bottom:-4px" mode="widthFix"/>
     </view>
   </view>
 </template>
@@ -20,7 +20,8 @@ export default {
   props: ["ad"],
   data() {
     return {
-      adtemp:[]
+      adtemp:[],
+      marginStyle:""
     }
   },
   created() {
@@ -38,6 +39,7 @@ export default {
       if (this.ad.height == "auto") {
         x.formatStyle.position = "unset";
       }
+      this.marginStyle=`${this.ad.top??0}px ${this.ad.right??0}px ${this.ad.bottom??0}px ${this.ad.left??0}px `
       this.adtemp.push(x)
     });
   },

components/search/index.vue

@@ -20,6 +20,7 @@
       :text-color="styleStr.textColor"
       :radius="styleStr.radius"
       :show-action="false"
+      :margin="marginStyle"
     ></u-search>
   </view>
 </template>
@@ -33,6 +34,7 @@ export default {
       formatStyle: "",
       postionStyle: "",
       bg: "",
+      marginStyle:""
     };
   },
   created() {
@@ -44,6 +46,7 @@ export default {
     } else {
       this.bg = this.styleStr.background;
     }
+    this.marginStyle=`${this.styleStr.top??0}px ${this.styleStr.right??0}px ${this.styleStr.bottom??0}px ${this.styleStr.left??0}px `
     console.log(this.styleStr.bg);
     // if (this.styleStr.p) {
     //   let p = this.styleStr.p;
@@ -64,5 +67,7 @@ export default {
 <style>
 .search-box {
   padding: 5px;
+  position: relative;
+  z-index: 2;
 }
 </style>

components/swiper/index.vue

@@ -18,7 +18,7 @@
       </swiper-item>
     </block>
   </swiper> -->
-  <view :style="{marginTop:swipers.topAndBottom+'px',marginBottom:swipers.topAndBottom+'px',marginLeft:swipers.leftAndRight+'px',marginRight:swipers.leftAndRight+'px'}">
+  <view :style="{marginTop:swipers.topAndBottom+'px',marginBottom:(swipers.topAndBottom<0?0:swipers.topAndBottom)+'px',marginLeft:swipers.leftAndRight+'px',marginRight:swipers.leftAndRight+'px'}">
 	  <u-swiper
 		:list="banners"
 		:effect3d="swipers.style == 2"

main.js

@@ -4,7 +4,6 @@ import api from './plugin/api'
 import uiconfig from './plugin/uiconfig'
 import uView from "uview-ui";
 import utils from './plugin/utils'
-
 Vue.use(api)
 Vue.use(uView)
 Vue.config.productionTip = false

node_modules/uview-ui/components/u-search/u-search.vue

 <template>
-	<view class="u-search">
+	<view class="u-search" :style="{'margin':margin}">
 		<view
 			class="u-content"
 			:style="{
@@ -76,6 +76,10 @@ export default {
 			type: String,
 			default: '#000'
 		},
+		margin:{
+			type: String,
+			default: '0'
+		},
 		// 搜索框背景色，默认值#f2f2f2
 		bgColor: {
 			type: String,

plugin/api.js

@@ -2,9 +2,9 @@ export default {
     install(Vue, options) {
         Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
             // Vue.prototype.host2 = "http://192.168.0.110:8200"
-         // Vue.prototype.host2 = "https://mallApi.oytour.com"	
+        Vue.prototype.host2 = "https://mallApi.oytour.com"
             // Vue.prototype.host2 = "http://192.168.2.16:8088"	
-		 		Vue.prototype.host2 = "http://192.168.2.65"
+            //Vue.prototype.host2 = "http://192.168.2.65"
         Vue.prototype.request = function(param, success, failed) {
             //网络请求
             uni.request({
@@ -48,18 +48,18 @@ export default {
                     },
                     success: res => {
 
-					if(res.data.resultCode == 10000){
+                        if (res.data.resultCode == 10000) {
 
                             let u = uni.getStorageSync("mall_UserInfo");
-						if(u){
+                            if (u) {
                                 this.getLogin_t(u)
                                 typeof failed == "function" && failed(res.data);
                             }
 
-					}else  if(res.data.resultCode != 1) {
-						if(res.data.couponResultCode==0){
+                        } else if (res.data.resultCode != 1) {
+                            if (res.data.couponResultCode == 0) {
 
-						}else{
+                            } else {
                                 uni.showToast({
                                     title: res.data.message,
                                     icon: "none",
@@ -68,8 +68,7 @@ export default {
 
                             typeof failed == "function" && failed(res.data);
 
-                    } 
-					else{
+                        } else {
 
                             typeof success == "function" && success(res.data);
                         }
@@ -85,9 +84,8 @@ export default {
             }
             // token失效再次登录接口
         Vue.prototype.getLogin_t = function(obj) {
-			let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0;
-		       this.request2(
-		       	{
+                let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
+                this.request2({
                         url: '/api/AppletLogin/Login',
                         data: {
                             Source: 1,