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

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/14
This commit is contained in:
odjbin
2022-12-18 15:07:28 +00:00
17 changed files with 193 additions and 174 deletions

View File

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

View File

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

View File

@@ -1,74 +1,74 @@
{ {
"name" : "shitong-app", "name": "shitong-app",
"appid" : "__UNI__CB00746", "appid": "__UNI__807D381",
"description" : "", "description": "",
"versionName" : "1.0.0", "versionName": "1.0.0",
"versionCode" : "100", "versionCode": "100",
"transformPx" : false, "transformPx": false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus": {
"usingComponents" : true, "usingComponents": true,
"nvueStyleCompiler" : "uni-app", "nvueStyleCompiler": "uni-app",
"compilerVersion" : 3, "compilerVersion": 3,
"splashscreen" : { "splashscreen": {
"alwaysShowBeforeRender" : true, "alwaysShowBeforeRender": true,
"waiting" : true, "waiting": true,
"autoclose" : true, "autoclose": true,
"delay" : 0 "delay": 0
}, },
/* */ /* */
"modules" : {}, "modules": {},
/* */ /* */
"distribute" : { "distribute": {
/* android */ /* android */
"android" : { "android": {
"permissions" : [ "permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
] ]
}, },
/* ios */ /* ios */
"ios" : {}, "ios": {},
/* SDK */ /* SDK */
"sdkConfigs" : {} "sdkConfigs": {}
} }
}, },
/* */ /* */
"quickapp" : {}, "quickapp": {},
/* */ /* */
"mp-weixin" : { "mp-weixin": {
"appid" : "wx4c2099a19c69664f", "appid": "wx4c2099a19c69664f",
"setting" : { "setting": {
"urlCheck" : false, "urlCheck": false,
"es6" : false, "es6": false,
"postcss" : false "postcss": false
}, },
"usingComponents" : true "usingComponents": true
}, },
"mp-alipay" : { "mp-alipay": {
"usingComponents" : true "usingComponents": true
}, },
"mp-baidu" : { "mp-baidu": {
"usingComponents" : true "usingComponents": true
}, },
"mp-toutiao" : { "mp-toutiao": {
"usingComponents" : true "usingComponents": true
}, },
"uniStatistics" : { "uniStatistics": {
"enable" : false "enable": false
}, },
"vueVersion" : "2" "vueVersion": "2"
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -59,14 +59,8 @@
<view v-if="tabCurrent === 1" style="margin-bottom: 20rpx;"> <view v-if="tabCurrent === 1" style="margin-bottom: 20rpx;">
<u-form-item label="上传图片" labelPosition="top"> <u-form-item label="上传图片" labelPosition="top">
<view style="padding-left: 20rpx;margin-top: 20rpx;"> <view style="padding-left: 20rpx;margin-top: 20rpx;">
<u-upload <u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
:fileList="fileList1" :maxCount="10"></u-upload>
@afterRead="afterRead"
@delete="deletePic"
name="1"
multiple
:maxCount="10"
></u-upload>
</view> </view>
</u-form-item> </u-form-item>
</view> </view>
@@ -182,50 +176,50 @@
codeChange(text) { codeChange(text) {
this.tips = text; this.tips = text;
}, },
// 删除图片 // 删除图片
deletePic(event) { deletePic(event) {
this[`fileList${event.name}`].splice(event.index, 1) this[`fileList${event.name}`].splice(event.index, 1)
}, },
// 新增图片 // 新增图片
async afterRead(event) { async afterRead(event) {
// 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式 // 当设置 multiple 为 true 时, file 为数组格式,否则为对象格式
let lists = [].concat(event.file) let lists = [].concat(event.file)
let fileListLen = this[`fileList${event.name}`].length let fileListLen = this[`fileList${event.name}`].length
lists.map((item) => { lists.map((item) => {
this[`fileList${event.name}`].push({ this[`fileList${event.name}`].push({
...item, ...item,
status: 'uploading', status: 'uploading',
message: '上传中' message: '上传中'
}) })
}) })
for (let i = 0; i < lists.length; i++) { for (let i = 0; i < lists.length; i++) {
const result = await this.uploadFilePromise(lists[i].url) const result = await this.uploadFilePromise(lists[i].url)
let item = this[`fileList${event.name}`][fileListLen] let item = this[`fileList${event.name}`][fileListLen]
this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, { this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
status: 'success', status: 'success',
message: '', message: '',
url: result url: result
})) }))
fileListLen++ fileListLen++
} }
}, },
uploadFilePromise(url) { uploadFilePromise(url) {
// return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
// let a = uni.uploadFile({ // let a = uni.uploadFile({
// url: 'http://192.168.2.21:7001/upload', // 仅为示例,非真实的接口地址 // url: 'http://192.168.2.21:7001/upload', // 仅为示例,非真实的接口地址
// filePath: url, // filePath: url,
// name: 'file', // name: 'file',
// formData: { // formData: {
// user: 'test' // user: 'test'
// }, // },
// success: (res) => { // success: (res) => {
// setTimeout(() => { // setTimeout(() => {
// resolve(res.data.data) // resolve(res.data.data)
// }, 1000) // }, 1000)
// } // }
// }); // });
// }) // })
}, },
} }
} }
</script> </script>

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 KiB

After

Width:  |  Height:  |  Size: 221 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB