xhj 2 лет назад
Родитель
Сommit
45fd0d6846

+ 17 - 6
card/index/index.vue

@@ -7,7 +7,8 @@
 				:style="'height: '+ systems.navigationHeight + 'rpx;margin-top:' + systems.ktxStatusHeight + 'rpx;'">
 				<navigator @click="toBack" hover-class="none"  class="back ddflex"
 					:style="'height: '+ systems.navigationHeight + 'rpx;'">
-					<image src="/static/pages/images/back_black.png"></image>
+					<image v-if="!pageBack" src="/static/pages/images/back_black.png"></image>
+					<image v-else src="/static/pages/images/back_home.png" style="width: 40rpx;height:40rpx"></image>
 				</navigator>
 				<view :class="'top-title tover' + (isTop == 1 ? ' top-black':'')"
 					:style="'line-height: '+ systems.navigationHeight + 'rpx;'">名片</view>
@@ -84,7 +85,7 @@
 					@click="goPhone()">
 					<image src="/card/static/images/phone1.png"></image>电话联系</view>
 				<view class="share-ta ddflex fflex" style="background: linear-gradient(80deg, #FF985A 0%, #FF5700 100%);"
-					 @click="jumpUrl('/card/poster/poster?id'+cardInfo.id)">
+					 @click="jumpUrl('/card/poster/poster?id='+cardInfo.id)">
 					<image src="/card/static/images/fx.png"></image>分享名片</view>
 			</view>
 			<view class="save-text ddflex" v-if="cardId" @click="saveToPhone()">
@@ -92,7 +93,7 @@
 			</view>
 			<view class="btns ddflex" v-if="!cardId" style="justify-content: center;">
 				<view class="share-ta ddflex" style="background: linear-gradient(84deg, #6FE5BC 0%, #27D699 100%);width: 260rpx;margin-right: 30rpx;"
-					@click="jumpUrl('/card/poster/poster?id'+cardInfo.id)">
+					@click="jumpUrl('/card/poster/poster?id='+cardInfo.id)">
 					<image src="/card/static/images/wdmp.png"></image>我的名片码</view>
 				<button open-type="share" class="share-ta ddflex" style="background: linear-gradient(80deg, #FF985A 0%, #FF5700 100%);width: 260rpx !important;"
 					>
@@ -344,7 +345,7 @@
 								<view scroll-x="true" :class="'pro-view' + (item.products.length == 1 ? ' pro-view1' : '')">
 									<view class="li" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 										<view class="ddflex">
-											<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pro-pic"></image>
+											<image :src="it.pic" mode="aspectFill" class="pro-pic"></image>
 											<view class="fflex">
 												<view class="title tovers">{{ it.title }}</view>
 												<view class="opts ddflex">
@@ -449,6 +450,8 @@ import util from '../../utils/util.js';
 				userInfo:'',
 				
 				isShowCodePop: false,
+				
+				pageBack:false
 			};
 		},
 		components:{ serviceContact },
@@ -461,6 +464,14 @@ import util from '../../utils/util.js';
 			uni.showLoading({
 				title:'加载中'
 			})
+			
+			let page = getCurrentPages()
+			let pages = page[page.length-2]
+			if(pages){
+				this.pageBack = false
+			}else{
+				this.pageBack = true
+			}
 		},
 
 		async onShow() {
@@ -483,7 +494,7 @@ import util from '../../utils/util.js';
 				return {
 					title: this.cardInfo.realName,
 					path: '/card/index/index?cardId=' + this.cardInfo.id + '&userId=' + userInfo.id + (userInfo.userType==1?('&shareId=' + userInfo.saleNo):''),
-					imageUrl: this.cardInfo.avatar + '?x-oss-process=style/w375', // 分享图
+					imageUrl: this.cardInfo.avatar, // 分享图
 				};
 			}
 		},
@@ -494,7 +505,7 @@ import util from '../../utils/util.js';
 				return {
 					title: this.cardInfo.realName,
 					path: '/card/index/index?cardId=' + this.cardInfo.id + '&userId=' + userInfo.id,
-					imageUrl: this.cardInfo.avatar + '?x-oss-process=style/w375', // 分享图
+					imageUrl: this.cardInfo.avatar, // 分享图
 				};
 			}
 		},

+ 4 - 4
card/poster/poster.vue

@@ -56,7 +56,7 @@ export default {
 		return {
 			id: '',
 			cardInfo: '',
-			codUrl: 'https://img.zhiqiyun.com/zqy3t9kp2zc5i/2023/03/20/be0cfb643cd38b97d5a7b14eecaaa8a1.png',
+			codUrl: '',
 			isShowLoading: false,
 			about:{}
 		};
@@ -74,7 +74,7 @@ export default {
 			return {
 				title: this.cardInfo.realName,
 				path: '/card/index/index?cardId=' + this.cardInfo.id + '&userId=' + userInfo.id,
-				imageUrl: this.cardInfo.avatar + '?x-oss-process=style/w375', // 分享图
+				imageUrl: this.cardInfo.avatar, // 分享图
 			};
 		}
 	},
@@ -99,7 +99,7 @@ export default {
 				provider: 'weixin',
 				scene: 'WXSceneSession',
 				type: 5,
-				imageUrl: this.cardInfo.avatar + '?x-oss-process=style/w375',
+				imageUrl: this.cardInfo.avatar,
 				title: this.cardInfo.realName,
 				summary: this.cardInfo.realName,
 				miniProgram: {
@@ -149,7 +149,7 @@ export default {
 				return new Promise((resolve, reject) => {
 					req.getRequest('/api/other/program/code', params, url => {
 						// console.log(url);
-						this.code = url
+						this.codUrl = url
 						resolve();
 					});
 				});

+ 3 - 0
components/to-userinfo/index.vue

@@ -44,6 +44,9 @@
 			getInfo() {
 				let that = this;
 				req.getRequest('/api/user/myInfo', {}, data => {
+					
+					if( data.saleNo) return this.showUserInfoPop = false;
+					
 					// if( !data.avatar) return this.showUserInfoPop = true;
 					// if( !data.nickName) return this.showUserInfoPop = true;
 					// if( !data.realName) return this.showUserInfoPop = true;

+ 1 - 1
mine/userinfo/userinfo.vue

@@ -12,7 +12,7 @@
 			<view class="li">
 				<text>昵称</text>
 				<view class="item">
-					<input name="nickName" placeholder="请输入昵称" :value="nickName" @input="intNickName" @blur="getNickname"></input>
+					<input type="nickname" name="nickName" placeholder="请输入昵称" :value="nickName" @input="intNickName" @blur="getNickname"></input>
 					<!-- {{nickName?nickName:''}} -->
 				</view>
 				<!-- <image src="/pages/images/more.png" class="rico"></image> -->

+ 1 - 1
mine/vip/vip.vue

@@ -167,7 +167,7 @@
 				<block v-for="(item, index) in likeList" :key="index">
 					<view class="li">
 						<view class="jsdimgs" @tap="toDetail" :data-id="item.id">
-							<image :src="item.pic + '?x-oss-process=style/w375'" mode="aspectFit" class="jsdpro"></image>
+							<image :src="item.pic" mode="aspectFit" class="jsdpro"></image>
 							<image src="/static/pages/images/jishida.png" v-if="item.isTimely === 1" class="jsdimg"></image>
 						</view>
 						<view class="jsdinfo">

+ 1 - 1
office/add/add.vue

@@ -7,7 +7,7 @@
 		</view>
 		<view class="list" v-if="pageList.length > 0">
 			<view class="li ddflex" v-for="(item, index) in pageList" :key="index">
-				<image :src="item.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+				<image :src="item.pic" mode="aspectFill" class="pic"></image>
 				<view class="fflex">
 					<view class="title tovers">{{ item.title }}</view>
 					<view class="money">¥{{ item.salePrice }}</view>

+ 2 - 2
office/detail/detail.vue

@@ -117,7 +117,7 @@
 					<view scroll-x="true" :class="'pro-view' + (detail.products.length == 1 ? ' pro-view1' : '')">
 						<view class="li" v-for="(item, index) in detail.products" :key="index" @click="toProductDetail(item)">
 							<view class="ddflex">
-								<image :src="item.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+								<image :src="item.pic" mode="aspectFill" class="pic"></image>
 								<view class="fflex">
 									<view class="title tovers">{{ item.title }}</view>
 									<view class="opt ddflex">
@@ -616,7 +616,7 @@ export default {
 			var img = '';
 			if (this.detail.url) {
 				var imgList = this.detail.url.split(',');
-				img = imgList[0] + '?x-oss-process=style/w375';
+				img = imgList[0];
 			} else {
 				let config = JSON.parse(req.getStorage('configRes'));
 				img = config.share_pic;

+ 2 - 2
office/poi/index.vue

@@ -128,7 +128,7 @@
 							<view scroll-x="true" class="pro-view pro-view1" v-if="item.products.length == 1">
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">
@@ -142,7 +142,7 @@
 							<scroll-view scroll-x="true" class="pro-view" v-else>
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">

+ 1 - 1
office/product/product.vue

@@ -4,7 +4,7 @@
 		<view class="list">
 			<view class="li" v-for="(item, index) in productList" :key="index">
 				<view class="pro ddflex">
-					<image :src="item.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+					<image :src="item.pic" mode="aspectFill" class="pic"></image>
 					<view class="fflex">
 						<view class="title tovers">{{ item.title }}</view>
 						<view class="money">¥{{ item.salePrice }}</view>

+ 2 - 2
office/search/index.vue

@@ -110,7 +110,7 @@
 							<view scroll-x="true" class="pro-view pro-view1" v-if="item.products.length == 1">
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">
@@ -124,7 +124,7 @@
 							<scroll-view scroll-x="true" class="pro-view" v-else>
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">

+ 2 - 2
office/team/index.vue

@@ -154,7 +154,7 @@
 							<view scroll-x="true" class="pro-view pro-view1" v-if="item.products.length == 1">
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">
@@ -168,7 +168,7 @@
 							<scroll-view scroll-x="true" class="pro-view" v-else>
 								<view class="lis" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pic"></image>
 										<view class="fflex">
 											<view class="title tover">{{ it.title }}</view>
 											<view class="opts ddflex">

+ 1 - 0
pages/index/index.vue

@@ -304,6 +304,7 @@
 		</view>
 			
 		<to-userinfo v-if="isShowUpdate"></to-userinfo>
+		
 	</view>
 </template>
 

+ 2 - 2
pages/interactive/index.vue

@@ -209,7 +209,7 @@
 										<view class="lis" v-for="(it, idx) in item.products" :key="idx"
 											@click="toProductDetail(it)">
 											<view class="ddflex">
-												<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill"
+												<image :src="it.pic" mode="aspectFill"
 													class="pic"></image>
 												<view class="fflex">
 													<view class="title tover">{{ it.title }}</view>
@@ -227,7 +227,7 @@
 										<view class="lis" v-for="(it, idx) in item.products" :key="idx"
 											@click="toProductDetail(it)">
 											<view class="ddflex">
-												<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill"
+												<image :src="it.pic" mode="aspectFill"
 													class="pic"></image>
 												<view class="fflex">
 													<view class="title tover">{{ it.title }}</view>

BIN
static/pages/images/back_home.png


+ 1 - 1
topics/collection/collection.vue

@@ -78,7 +78,7 @@
 						<view scroll-x="true" :class="'pro-view' + (item.products.length == 1 ? ' pro-view1' : '')">
 							<view class="li" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 								<view class="ddflex">
-									<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pro-pic"></image>
+									<image :src="it.pic" mode="aspectFill" class="pro-pic"></image>
 									<view class="fflex">
 										<view class="title tovers">{{ it.title }}</view>
 										<view class="opts ddflex">

+ 1 - 1
topics/detail/detail.vue

@@ -382,7 +382,7 @@ export default {
 			var img = '';
 			if (item.url) {
 				var imgList = item.url;
-				img = imgList[0] + '?x-oss-process=style/w375';
+				img = imgList[0];
 			} else {
 				let config = JSON.parse(req.getStorage('configRes'));
 				img = config.share_pic;

+ 1 - 1
topics/home/home.vue

@@ -208,7 +208,7 @@
 							<view scroll-x="true" :class="'pro-view' + (item.products.length == 1 ? ' pro-view1' : '')">
 								<view class="li" v-for="(it, idx) in item.products" :key="idx" @click="toProductDetail(it)">
 									<view class="ddflex">
-										<image :src="it.pic + '?x-oss-process=style/w375'" mode="aspectFill" class="pro-pic"></image>
+										<image :src="it.pic" mode="aspectFill" class="pro-pic"></image>
 										<view class="fflex">
 											<view class="title tovers">{{ it.title }}</view>
 											<view class="opts ddflex">

+ 1 - 1
topics/release/release.vue

@@ -346,7 +346,7 @@ export default {
 			var img = '';
 			if (item.url) {
 				var imgList = item.url;
-				img = imgList[0] + '?x-oss-process=style/w375';
+				img = imgList[0];
 			} else {
 				let config = JSON.parse(req.getStorage('configRes'));
 				img = config.share_pic;