Merge branch 'master' of http://git.qiniu1314.com/cmy/CBB3

pages/guild/itemIndex.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/tream_bg.png"></image>
+			<image src="/static/image/img27.png?timestamp=1742528623"></image>
 		</view>
 		<uni-nav-bar color="#fff" :border="false" statusBar left-icon="left" @clickLeft="utils.navigateBack()"
 			backgroundColor="transparent" fixed title="我的部门"></uni-nav-bar>

pages/guild/order/order.vue

@@ -41,7 +41,7 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/au_order_bg.png"></image>
+			<image src="/static/img/au_order_bg.png?timestamp=1742528623"></image>
 			<view class="order-top fx-r fx-bc fx-ac" :style="'height:calc(45vw  - 44px - ' + statusBarHeight + 'px - 20px);top:' + (statusBarHeight + 20 + 44) + 'px' ">
 				<view class="topbtn" @tap="tapCk('buy')" :class="navType == 'buy' ? 'active' : ''">
 					我的买单

pages/gz/addBind.vue

@@ -86,6 +86,7 @@
 		onShow() {},
 		methods: {
 			addBind(){
+				let obj = this
 				uni.showModal({
 					title: '提示',
 					content: '你确定要绑定吗？',
@@ -94,17 +95,17 @@
 							uni.showLoading({
 								title: '绑定中...'
 							});
-							this.request.post("bind",{
-								uid1:this.uid1,
-								uid2: this.uid2,
+							obj.request.post("bind",{
+								uid1:obj.uid1,
+								uid2: obj.uid2,
 							}).then(res => {
 								uni.showModal({
 									title: '系统提示',
 									content: res.msg,
 									showCancel: false
 								});
-								this.uid1 = ''
-								this.uid2 = ''
+								obj.uid1 = ''
+								obj.uid2 = ''
 								uni.hideLoading();
 							}).catch(res=>{
 								console.log(res);

pages/gz/bindIndex.vue

@@ -72,6 +72,7 @@
 				})
 			},
 			delBind(id){
+				let obj = this
 				uni.showModal({
 					title: '提示',
 					content: '你确定要解绑吗？',
@@ -80,7 +81,7 @@
 							uni.showLoading({
 								title: '解绑中..'
 							});
-							this.request.post("unbind",{
+							obj.request.post("unbind",{
 								id:id,
 							}).then(res => {
 								uni.hideLoading();
@@ -89,7 +90,7 @@
 									content: res.msg,
 									showCancel: false
 								});
-								this.getList(true)
+								obj.getList(true)
 							}).catch(res=>{
 								console.log(res,'99999')
 								uni.hideLoading();

pages/gz/index.vue

@@ -175,7 +175,7 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/detail_bg.png"></image>
+			<image src="/static/img/detail_bg.png?timestamp=1742528623"></image>
 			</view>
 		<view class="app-h">
 			<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" left-icon="left" @clickLeft="utils.navigateBack()" fixed title="总监职能中心"></uni-nav-bar>

pages/gz/user.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/tream_bg.png"></image>
+			<image src="/static/img/detail_bg.png?timestamp=1742528623"></image>
 		</view>
 		<view class="app-h">
 			<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" left-icon="left"

pages/index/index.nvue

@@ -1,7 +1,7 @@
 <template>
 	<view class="app">
 		<view class="app-top">
-			<image class="topBg" src="../../static/image/img01.png" mode="scaleToFill"></image>
+			<image class="topBg" src="../../static/image/img01.png?timestamp=1742528623" mode="scaleToFill"></image>
 		</view>
 		<view class=" mtop">
 			<view class="top-body">
@@ -14,7 +14,7 @@
 							</view>
 						</navigator>
 					</view>
-					<image src="/static/img/ic_information.png" class="information"></image>
+					<image src="/static/img/ic_information.png?timestamp=1742528623" class="information"></image>
 				</view>
 			</view>
 		</view>
@@ -24,19 +24,19 @@
 				<!--九宫格-->
 				<view class="grid gridItem" v-if="sysData.is_audit == 0">
 					<view class="item" @tap="tapOpen2" data-url="/pages/user/order/index">
-						<image class="icon" mode="aspectFill" src="/static/ad/1.png"></image>
+						<image class="icon" mode="aspectFill" src="/static/ad/1.png?timestamp=1742528623"></image>
 						<text class="label">提货订单</text>
 					</view>
 					<view class="item" @tap="$refs.customer.open()">
-						<image class="icon" mode="aspectFill" src="/static/ad/2.png"></image>
+						<image class="icon" mode="aspectFill" src="/static/ad/2.png?timestamp=1742528623"></image>
 						<text class="label">联系客服</text>
 					</view>
 					<view class="item" @tap="tapOpen" data-url="/pages/merchant/list">
-						<image class="icon" mode="aspectFill" src="/static/ad/3.png"></image>
+						<image class="icon" mode="aspectFill" src="/static/ad/3.png?timestamp=1742528623"></image>
 						<text class="label">附近门店</text>
 					</view>
 					<view class="item" @tap="tapOpen2" data-url="/pages/guild/order/order">
-						<image class="icon" mode="aspectFill" src="/static/ad/4.png"></image>
+						<image class="icon" mode="aspectFill" src="/static/ad/4.png?timestamp=1742528623"></image>
 						<text class="label">抢购订单</text>
 					</view>
 				</view>
@@ -44,7 +44,7 @@
 			<view v-if="sysData.is_audit == 0">
 				<!--CBB潮贝抢货通道-->
 				<view class="team-buy" @tap="tapOpen" data-url="/pages/guild/itemIndex" v-if="guData!= null">
-					<image class="teamBg" src="@/static/img/indexChatBg1.png" mode="widthFix"></image>
+					<image class="teamBg" src="/static/image/indexChatBg1.png?timestamp=1742528623" mode="widthFix"></image>
 					<view class="team-show">
 						<view class="labelBox">
 							<text class="label">{{ guData.name }}</text>
@@ -60,7 +60,7 @@
 			<!--提货好物-->
 			<view class="goods">
 				<view class="top">
-					<image class="topBgImg" src="@/static/img/index_item_bg.png" mode="widthFix"></image>
+					<image class="topBgImg" src="@/static/img/index_item_bg.png?timestamp=1742528623" mode="widthFix"></image>
 					<image class="icon" src="/static/img/logo.png"></image>
 					<view class="topTitle">
 						<text class="label">货款提货</text>
@@ -92,7 +92,7 @@
 			<!--最新门店-->
 			<view class="shop" v-if="sysData.is_audit == 0">
 				<view class="top">
-					<image class="topBgImg" src="@/static/img/index_item_bg.png" mode="widthFix"></image>
+					<image class="topBgImg" src="@/static/img/index_item_bg.png?timestamp=1742528623" mode="widthFix"></image>
 					<image class="icon" src="/static/img/logo.png"></image>
 					<view class="topTitle">
 						<text class="label">易趣C果园({{300+merchantCount}}家)</text>

pages/index/index.vue

@@ -31,22 +31,22 @@
 					<!--九宫格-->
 					<view class="grid fx-r fx-bc fx-ac  gridItem" v-if="sysData.is_audit == 0">
 						<view class="item fx-h fx-bc fx-ac" @tap="tapOpen2" data-url="/pages/user/order/index">
-							<image class="icon" mode="aspectFill" src="/static/ad/1.png"></image>
+							<image class="icon" mode="aspectFill" src="/static/ad/1.png?timestamp=1742528623"></image>
 							<view class="label">提货订单</view>
 						</view>
 
 						<view class="item  fx-h fx-bc fx-ac" @tap="$refs.customer.open()">
-							<image class="icon" mode="aspectFill" src="/static/ad/2.png"></image>
+							<image class="icon" mode="aspectFill" src="/static/ad/2.png?timestamp=1742528623"></image>
 							<view class="label">联系客服</view>
 						</view>
 
 						<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/merchant/list">
-							<image class="icon" mode="aspectFill" src="/static/ad/3.png"></image>
+							<image class="icon" mode="aspectFill" src="/static/ad/3.png?timestamp=1742528623"></image>
 							<view class="label">附近门店</view>
 						</view>
 
 						<view class="item fx-h fx-bc fx-ac" @tap="tapOpen2" data-url="/pages/guild/order/order">
-							<image class="icon" mode="aspectFill" src="/static/ad/4.png"></image>
+							<image class="icon" mode="aspectFill" src="/static/ad/4.png?timestamp=1742528623"></image>
 							<view class="label">抢购订单</view>
 						</view>
 
@@ -708,7 +708,7 @@
 
 	//抢货通道
 	.team-buy {
-		background-image: url("@/static/img/indexChatBg1.png");
+		background-image: url("@/static/image/indexChatBg1.png?timestamp=1742528623");
 		background-repeat: no-repeat;
 		background-position: left bottom;
 		background-size: 100% auto;

pages/login/forgotPassword.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="app">
 		<view class="top-view">
-			<image class="bg" src="/static/img/login-bg.png"></image>
+			<image class="bg" src="/static/img/login-bg.png?timestamp=1742528623"></image>
 			<view class="inner">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
 				<view class="inner-body fx-h fx-bc fx-ac">
 					<view class="prv" @tap="utils.navigateBack()">
-						<image src="/static/img/ic_back_white.png" class="icon-back"></image>
+						<image src="/static/img/ic_back_white.png?timestamp=1742528623" class="icon-back"></image>
 					</view>
 					<view class="logo">
-						<image src="/static/img/cbb_white.png"></image>
+						<image src="/static/img/cbb_white.png?timestamp=1742528623"></image>
 					</view>
 					<view class="label-text">忘记密码</view>
 				</view>

pages/login/index.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="app">
 		<view class="top-view">
-			<image class="bg" src="/static/img/login-bg.png"></image>
+			<image class="bg" src="/static/img/login-bg.png?timestamp=1742528623"></image>
 			<view class="inner">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
 				<view class="inner-body fx-h fx-bc fx-ac">
 					<view class="prv" @tap="utils.navigateBack()">
-						<image src="/static/img/ic_back_white.png" class="icon-back"></image>
+						<image src="/static/img/ic_back_white.png?timestamp=1742528623" class="icon-back"></image>
 					</view>
 					<view class="logo">
-						<image src="/static/img/cbb_white.png"></image>
+						<image src="/static/img/cbb_white.png?timestamp=1742528623"></image>
 					</view>
 					<view class="label-text">欢迎登录长城易趣拍</view>
 				</view>
@@ -21,13 +21,13 @@
 				<view class="login-input fx-r">
 					<view class="left fx-r fx-bc ">
 						<view class="label">+86</view>
-						<image class="loginv" src="/static/img/login-v.png"></image>
+						<image class="loginv" src="/static/img/login-v.png?timestamp=1742528623"></image>
 					</view>
 					<input type="number" v-model="form.mobile" placeholder="请输入手机号" />
 				</view>
 				<view class="login-input fx-r">
 					<view class="left fx-h fx-ac">
-						<image class="icon" style="margin-left: 20rpx;" src="/static/img/login-password.png"></image>
+						<image class="icon" style="margin-left: 20rpx;" src="/static/img/login-password.png?timestamp=1742528623"></image>
 					</view>
 					<input  type="text" v-model="form.password" password="*"  placeholder="请输入密码" />
 				</view>
@@ -39,8 +39,8 @@
 				</view>
 				<view class="agament fx-r">
 					<view class="checkedRead" @tap="isRead = !isRead">
-						<image class="agamentIcon" v-if="!isRead" src="/static/img/radio_buttons.png"></image>
-						<image class="agamentIcon" v-else src="/static/img/radio_buttons_btn.png"></image>
+						<image class="agamentIcon" v-if="!isRead" src="/static/img/radio_buttons.png?timestamp=1742528623"></image>
+						<image class="agamentIcon" v-else src="/static/img/radio_buttons_btn.png?timestamp=1742528623"></image>
 						<text class="agamentText">
 							已阅读并同意
 						</text>

pages/login/register.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="app">
 		<view class="top-view">
-			<image class="bg" src="/static/img/login-bg.png"></image>
+			<image class="bg" src="/static/img/login-bg.png?timestamp=1742528623"></image>
 			<view class="inner">
 				<view class="statusBar" :style="'height:'  + statusBarHeight + 'px'"></view>
 				<view class="inner-body fx-h fx-bc fx-ac">
 					<view class="prv" @tap="utils.navigateBack()">
-						<image src="/static/img/ic_back_white.png" class="icon-back"></image>
+						<image src="/static/img/ic_back_white.png?timestamp=1742528623" class="icon-back"></image>
 					</view>
 					<view class="logo">
-						<image src="/static/img/cbb_white.png"></image>
+						<image src="/static/img/cbb_white.png?timestamp=1742528623"></image>
 					</view>
 					<view class="label-text">注册长城易趣拍</view>
 				</view>

pages/user/detail/anticipate.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/detail_bg.png"></image>
+			<image src="/static/img/detail_bg.png?timestamp=1742528623"></image>
 			<view class="body fx-h fx-bc fx-ac">
 				<view class="count">{{ user.anticipate || 0 }}</view>
 				<view class="label">我的易趣卷</view>
 			</view>
 			<view class="transfer fx-r fx-bc" @tap="tapTransfer">
-				<image src="/static/img/ic_transfer.png"></image>
+				<image src="/static/img/ic_transfer.png?timestamp=1742528623"></image>
 				余额转账
 			</view>
 		</view>

pages/user/detail/detail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/detail_bg.png"></image>
+			<image src="/static/img/detail_bg.png?timestamp=1742528623"></image>
 			<view class="body fx-h fx-bc fx-ac">
 				<view class="count">{{ user.good_integral || 0 }}</view>
 				<view class="label">提货积分</view>

pages/user/detail/integral.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
 		<view class="app-bg">
-			<image src="/static/img/detail_bg.png"></image>
+			<image src="/static/img/detail_bg.png?timestamp=1742528623"></image>
 			<view class="body fx-h fx-bc fx-ac">
 				<view class="count">{{ user.integral || 0 }}</view>
 				<view class="label">我的趣豆</view>
 			</view>
 			<view class="fukuan" @click="fukuan" style="position: absolute;right: 30rpx;top: 180rpx;">
-				<image src="/static/img/fukuan.png" style="width: 50rpx;height: 50rpx;"></image>
+				<image src="/static/img/fukuan.png?timestamp=1742528623" style="width: 50rpx;height: 50rpx;"></image>
 			</view>
 		</view>
 		<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" left-icon="left"

pages/user/index.vue

@@ -83,28 +83,28 @@
 				<view class="order-items fx-r fx-bc">
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/qrcode/index"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-content1.png"></image>
+						<image src="/static/img/user-content1.png?timestamp=1742528623"></image>
 						<view class="name">邀请好友</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/team/vermicelli"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-content2.png"></image>
+						<image src="/static/img/user-content2.png?timestamp=1742528623"></image>
 						<view class="name">我的粉丝</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/user/order/index">
-						<image src="/static/img/user-content3.png"></image>
+						<image src="/static/img/user-content3.png?timestamp=1742528623"></image>
 						<view class="name">提货订单</view>
 					</view>
 
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/guild/order/order"
 						v-if="sysData.is_audit == 0">
-						<image src="/static/img/user-content4.png"></image>
+						<image src="/static/img/user-content4.png?timestamp=1742528623"></image>
 						<view class="name">购买订单</view>
 					</view>
 					<view class="item fx-h fx-bc" @tap="tapOpen" data-url="/pages/guild/order/myPro">
-						<image src="/static/img/user-content5.png"></image>
+						<image src="/static/img/user-content5.png?timestamp=1742528623"></image>
 						<view class="name">我的商品</view>
 					</view>