Merge branch 'master' of http://git.sjzkeji.com/panghu/school_webUser

components/en-utils/en-nav/en-nav.vue

@@ -10,14 +10,10 @@
 					<!-- <uni-icons type="left" :color="leftColor" size="18"  ></uni-icons> -->
 					<image class="toLeft" src="@/static/img/toLeft.png" mode=""></image>
 				</view>
-
 				<view v-if="!customNav" :style="[{'color': titleColor}]" class="title-text">{{title}}</view>
 				<view v-else class="">
 					<slot name="custom"></slot>
 				</view>
-
-
-
 				<view v-if="rightShow" class="right-button button" @click="rightClick">
 					<slot name="right">
 						<text class="rightName" v-if="rightType===1">{{rightText}}</text>
@@ -25,7 +21,6 @@
 					</slot>
 				</view>
 				<view v-else class="w-right"></view>
-
 			</view>
 		</view>
 
@@ -34,8 +29,6 @@
 			</view>
 		</view>
 	</view>
-
-
 </template>
 
 <script>

manifest.json

@@ -1,94 +1,106 @@
 {
-    "name" : "学校",
-    "appid" : "__UNI__1578510",
-    "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {},
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            /* ios打包配置 */
-            "ios" : {},
-            /* SDK配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx3530a27aa802e153",
-        "setting" : {
-            "urlCheck" : false,
-            "minified" : true
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "获取您的位置授权，用于更准确的，更快捷的为您服务"
-            }
-        },
-        "requiredPrivateInfos" : [ "getLocation" ]
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "devServer" : {
-            "https" : false,
-            "proxy" : {
-                "/api" : {
-                    "target" : "https://test-userapi.sjzkeji.com",
-                    "changeOrigin" : true,
-                    "secure" : false,
-                    "pathRewrite" : {
-                        "^/api" : "api"
-                    }
-                }
-            }
-        }
-    }
-}
+	"name": "学校",
+	"appid": "__UNI__1578510",
+	"description": "",
+	"versionName": "1.0.1",
+	"versionCode": 101,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"safearea": {
+			"background": "#FFFFFF",
+			"bottom": {
+				"offset": "auto"
+			}
+		},
+		/* 模块配置 */
+		"modules": {},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			/* ios打包配置 */
+			"ios": {},
+			/* SDK配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "wx3530a27aa802e153",
+		"setting": {
+			"urlCheck": false,
+			"minified": true
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "获取您的位置授权，用于更准确的，更快捷的为您服务"
+			}
+		},
+		"safearea": {
+			"background": "#FFFFFF",
+			"bottom": {
+				"offset": "auto"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation"]
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"devServer": {
+			"https": false,
+			"proxy": {
+				"/api": {
+					"target": "https://test-userapi.sjzkeji.com",
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "api"
+					}
+				}
+			}
+		}
+	}
+}

pages-my/cooperate.vue

@@ -8,7 +8,7 @@
 						请描述你想合作的想法
 					</view>
 					<view class="textarea-box">
-						<textarea v-model="formData.content" placeholder-style="color:#ccc" auto-height maxlength='100' placeholder="请在这里输入您的想法" />
+						<textarea class="textarea-box" v-model="formData.content" placeholder-style="color:#ccc" maxlength='100' placeholder="请在这里输入您的想法" />
 					</view>
 				</view>
 				<view class="bgc-f b-rad-20 box-sizing-border phone-box">

pages-my/feedback.vue

@@ -8,7 +8,7 @@
 						请描述你的建议和想法，我们会不断优化改进
 					</view>
 					<view class="textarea-box">
-						<textarea v-model="formData.content" placeholder-style="color:#ccc" auto-height maxlength='100' placeholder="还有更多建议和想法？快告诉我们吧~" />
+						<textarea class="textarea-box" v-model="formData.content" placeholder-style="color:#ccc" maxlength='100' placeholder="还有更多建议和想法？快告诉我们吧~" />
 					</view>
 					<view class="up-img-box align-items-center flex-wrap-wrap">
 						<view class="up-img" v-for="(itme, i) in formData.image" :key="i">

pages-school/add-circle.vue

@@ -22,7 +22,7 @@
 		</view>
 		
 		
-		<uni-popup ref="popup" type="bottom">
+		<uni-popup ref="popup" type="bottom" background-color="#fff">
 			<view class="pop-box box-border-box p-24">
 				<view class="head-pop flex-justify-space align-items-center mb-24">
 					<uni-icons @click.stop="closePop(1)" type="closeempty" size="24"></uni-icons>
@@ -137,7 +137,7 @@
 		.pop-box{
 			width: 100%;
 			height: 50vh;
-			background-color: #fff;
+			// background-color: #fff;
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
 			display: flex;
 			flex-direction: column;

pages-school/school-circle.vue

@@ -627,7 +627,11 @@
 		},
 	}
 </script>
-
+<style>
+	body{
+		background: #fff;
+	}
+</style>
 <style scoped lang="scss">
 	.label-box {
 		padding: 0 12rpx;
@@ -661,7 +665,6 @@
 		padding-right: 24rpx;
 		position: relative;
 
-
 		.pop-h-20 {
 			height: 18vh !important;
 		}

pages-takeout/takeout.vue

@@ -104,7 +104,7 @@
 							<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
 						</template>
 					</EnBlank>
-					<view v-else class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in listData">
+					<view v-else class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in listData" @click="toShop(item)">
 						<image class="left-img" :src="item.shop_logo" mode="scaleToFill"></image>
 						<view class="flex-1">
 							<view class="align-items-center mb-8">
@@ -129,7 +129,7 @@
 
 							<view class="goods-items-list display-flex view-nowrap">
 								<view class="goods-items-list-box" v-for="(info,iGoods) in item.goods">
-									<image class="mb-12" :src="info.goods_image" mode=""></image>
+									<image class="mb-12" :src="info.goods_image" mode="scaleToFill"></image>
 									<view class="mb-8 fw-600 text-overflow-ellipsis-one fs-26">{{info.goods_name}}
 									</view>
 									<view class="">
@@ -423,7 +423,7 @@
 
 		.goos-list-box {
 			width: 100%;
-			min-height: 428rpx;
+			// min-height: 428rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(51, 51, 51, 0.1);
 			border-radius: 20rpx;