Merge pull request '修改图片画质,已上传体验版成功' (#14) from dengjie2 into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/14

components/certifiedCj/certifiedCj.vue

@@ -59,8 +59,9 @@
 			clickCj(index) {
 				if (index == 0) {
 					uni.navigateTo({
-						url: '/pages/detail/certifiedCjDetail/certifiedCjDetail'
+						url: '../../packageReport/certifiedCjDetail/certifiedCjDetail'
 					})
+
 				}
 			}
 		}

components/news/news.vue

@@ -50,7 +50,7 @@
 			clickNews(index) {
 				if (index == 0) {
 					uni.navigateTo({
-						url: '/pages/detail/xwDetail/xwDetail'
+						url: '../../packageReport/xwDetail/xwDetail'
 					})
 				}
 			},

manifest.json

@@ -1,28 +1,28 @@
 {
-    "name" : "shitong-app",
-    "appid" : "__UNI__CB00746",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
+	"name": "shitong-app",
+	"appid": "__UNI__807D381",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
 	/* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
 		},
 		/* 模块配置 */
-        "modules" : {},
+		"modules": {},
 		/* 应用发布信息 */
-        "distribute" : {
+		"distribute": {
 			/* android打包配置 */
-            "android" : {
-                "permissions" : [
+			"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\"/>",
@@ -41,34 +41,34 @@
 				]
 			},
 			/* ios打包配置 */
-            "ios" : {},
+			"ios": {},
 			/* SDK配置 */
-            "sdkConfigs" : {}
+			"sdkConfigs": {}
 		}
 	},
 	/* 快应用特有相关 */
-    "quickapp" : {},
+	"quickapp": {},
 	/* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx4c2099a19c69664f",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : false,
-            "postcss" : false
+	"mp-weixin": {
+		"appid": "wx4c2099a19c69664f",
+		"setting": {
+			"urlCheck": false,
+			"es6": false,
+			"postcss": false
 		},
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-alipay" : {
-        "usingComponents" : true
+	"mp-alipay": {
+		"usingComponents": true
 	},
-    "mp-baidu" : {
-        "usingComponents" : true
+	"mp-baidu": {
+		"usingComponents": true
 	},
-    "mp-toutiao" : {
-        "usingComponents" : true
+	"mp-toutiao": {
+		"usingComponents": true
 	},
-    "uniStatistics" : {
-        "enable" : false
+	"uniStatistics": {
+		"enable": false
 	},
-    "vueVersion" : "2"
+	"vueVersion": "2"
 }

packageReport/certifiedCj/certifiedCj.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="margin-top: 20rpx; height: 1176rpx;background: #FFFFFF;">
+	<view>
 		<certifiedCj></certifiedCj>
 		<view v-if="cjsShow" class="no-data">已经到底啦！</view>
 	</view>
@@ -19,6 +19,10 @@
 </script>
 
 <style lang="scss">
+	page {
+		background: #FFFFFF;
+	}
+
 	.no-data {
 		text-align: center;
 		margin-top: 29rpx;

packageReport/certifiedCjDetail/certifiedCjDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<u--image :src="src" width="750rpx" height="290rpx" :lazy-load="true">
-		</u--image>
+		<u-swiper :list="swiperList" indicatorMode="line " width="750rpx" height="290rpx" radius="0" circular>
+		</u-swiper>
 		<view class="feature">
 			<text class="one_title">经营范围及特色</text>
 			<view class="green_block">
@@ -32,7 +32,7 @@
 	export default {
 		data() {
 			return {
-				src: '/static/detail/cj_bg.png',
+				// src: '/static/detail/cj_bg.png',
 				features: '活冻鲍鱼,冻煮鲍鱼,鲍鱼罐头 佛跳墙,海螺片',
 				business_introduce: '福建省海纳川食品有限公司是一家从事水产养殖，加工与销售为一体的现代化企业，公司主要加工：活冻鲍鱼，溏心皇金鲍，兰花蟹，黄金鲍片，佛跳墙，大盆菜，火锅小章鱼，鲨鱼礼盒等系列产品。公司位于福建省自由贸易试验区马尾片区，离全国大的水产交易市场--马尾名成水产市场不到一公里，这里交通方便，商贾云集，冷链物流通达全国。',
 				showList: [{
@@ -45,6 +45,10 @@
 					{
 						src: '/static/report/zhanwei_xf(1).png'
 					},
+				],
+				swiperList: [
+					'/static/detail/cj_bg.png',
+					'/static/detail/cj_bg.png'
 				]
 
 			}

packageReport/news/news.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="margin-top: 20rpx; height: 1176rpx;background: #FFFFFF;">
+	<view>
 		<news></news>
 		<view v-if="newsShow" class="no-data">已经到底啦！</view>
 	</view>
@@ -22,6 +22,12 @@
 </script>
 
 <style lang="scss">
+	page {
+		background: #FFFFFF;
+	}
+
+
+
 	.no-data {
 		text-align: center;
 		margin-top: 29rpx;

packageReport/xwDetail/xwDetail.vue

@@ -1,17 +1,17 @@
 <template>
-	<view>
-		<view class="xw_title">
+	<view style="padding: 12rpx 16rpx;">
+		<view class="xwD_title">
 			{{title}}
 		</view>
 		<view style="display: flex;">
-			<text class="xw_time">
+			<text class="xwD_time">
 				{{time}}
 			</text>
-			<text class="xw_time xw_place">
+			<text class="xwD_time xwD_place">
 				{{place}}
 			</text>
 		</view>
-		<view class="xw_content">
+		<view class="xwD_content">
 			<u-parse :content="news" @preview="preview" @navigate="navigate"></u-parse>
 		</view>
 	</view>
@@ -36,10 +36,9 @@
 <style lang="scss">
 	page {
 		background-color: #fff;
-		padding: 12rpx 16rpx;
 	}
 
-	.xw_title {
+	.xwD_title {
 		font-size: 38rpx;
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: bold;
@@ -48,7 +47,7 @@
 		letter-spacing: 1rpx;
 	}
 
-	.xw_time {
+	.xwD_time {
 		font-size: 24rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
 		font-weight: 400;
@@ -57,11 +56,12 @@
 		margin-top: 6rpx;
 	}
 
-	.xw_place {
+	.xwD_place {
 		padding-left: 20rpx;
 	}
 
-	.xw_content {
+	.xwD_content {
 		margin-top: 38rpx;
+		// border: none;
 	}
 </style>

pages.json

@@ -54,8 +54,12 @@
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/my/bindCompony/bindCompony",
+		}
+	],
+	"subPackages": [{
+			"root": "packageMy",
+			"pages": [{
+				"path": "bindCompony/bindCompony",
 				"style": {
 					"navigationBarTitleText": "绑定公司",
 					"navigationBarTextStyle": "white",
@@ -64,7 +68,7 @@
 				}
 
 			}, {
-			"path": "pages/my/browseHistory/browseHistory",
+				"path": "browseHistory/browseHistory",
 				"style": {
 					"navigationBarTitleText": "浏览记录",
 					"navigationBarTextStyle": "white",
@@ -72,16 +76,16 @@
 					"enablePullDownRefresh": false
 				}
 			}, {
-			"path": "pages/my/memberCenter/memberCenter",
+				"path": "memberCenter/memberCenter",
 				"style": {
 					"navigationBarTitleText": "会员中心",
 					"navigationBarTextStyle": "white",
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
-		}
-	],
-	"subPackages": [{
+			}]
+		},
+		{
 			"root": "packageSearch",
 			"pages": [{
 					"path": "search/search",

pages/detail/productsDetail/productsDetail.vue

@@ -1,8 +1,10 @@
 <template>
 	<view>
 		<view v-for="(item,index) in detailList" :key="index">
-			<u-image :src="item.src" width="750rpx" height="530rpx" :lazy-load="true">
-			</u-image>
+
+			<u-swiper :list="swiperList" indicatorMode="line " width="750rpx" height="530rpx" radius="0" circular>
+			</u-swiper>
+
 			<view class="collect">
 				<u-icon :name="like?'heart-fill':'heart'" color="#FEAA19" size="23" @click.stop="likeTap"></u-icon>
 				<view class="collect_text">收藏</view>
@@ -41,7 +43,7 @@
 			return {
 				like: false,
 				detailList: [{
-					src: '/static/detail/zhanwei_xppx.png',
+					// src: '/static/detail/zhanwei_xppx.png',
 					title: '锅巴',
 					tag: '零食铺子',
 					desc: '糯米蟹黄锅巴散装，非油炸绿色健康食品',
@@ -50,7 +52,11 @@
 					tagTwo: '无添加剂',
 					time: '2022年12月04日',
 					content: '<h1>一级标题</h1><br/><h2>二级标题</h2>'
-				}]
+				}],
+				swiperList: [
+					'/static/detail/zhanwei_xppx.png',
+					'/static/detail/zhanwei_xppx.png'
+				]
 			}
 		},
 		methods: {

pages/ideasAndNeeds/ideasAndNeeds.vue

@@ -59,14 +59,8 @@
 			<view v-if="tabCurrent === 1" style="margin-bottom: 20rpx;">
 				<u-form-item label="上传图片" labelPosition="top">
 					<view style="padding-left: 20rpx;margin-top: 20rpx;">
-						<u-upload
-							:fileList="fileList1"
-							@afterRead="afterRead"
-							@delete="deletePic"
-							name="1"
-							multiple
-							:maxCount="10"
-						></u-upload>
+						<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+							:maxCount="10"></u-upload>
 					</view>
 				</u-form-item>
 			</view>

pages/my/my.vue

@@ -43,25 +43,25 @@
 			//跳转到绑定公司页面
 			bindCompany() {
 				uni.navigateTo({
-					url: '/pages/my/bindCompony/bindCompony'
+					url: '../../packageMy/bindCompony/bindCompony'
 				})
 			},
 			//跳转到会员中心页面
 			toMemberCenter() {
 				uni.navigateTo({
-					url: '/pages/my/memberCenter/memberCenter'
+					url: '../../packageMy/memberCenter/memberCenter'
 				})
 			},
 			//跳转到浏览记录页面
 			toBrowseHistory() {
 				uni.navigateTo({
-					url: '/pages/my/browseHistory/browseHistory?id=' + 1
+					url: '../../packageMy/browseHistory/browseHistory?id=' + 1
 				})
 			},
 			//跳转到我的收藏页面
 			toMyCollect() {
 				uni.navigateTo({
-					url: '/pages/my/browseHistory/browseHistory?id=' + 2
+					url: '../../packageMy/browseHistory/browseHistory?id=' + 2
 				})
 			},
 			// 联系客服模态框