Merge branch 'main' into prod

components/goodsCard.vue

@@ -43,14 +43,6 @@
 					</block> -->
 				</view>
 			</view>
-
-			<!-- 	<view class='noCommodity' v-if="productList.length==0">
-				<view class='pictrue' style=" margin: 60rpx auto;">
-					<image src='/static/images/noCart.png'></image>
-					<view>暂无商品</view>
-				</view>
-				<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>
-			</view> -->
 		</block>
 
 

pages/columnGoods/goods_coupon_list/index.vue

@@ -87,7 +87,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<view>暂无商品，去看点什么吧</view>
 					</view>
 					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

pages/columnGoods/goods_list/index.vue

@@ -79,7 +79,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<view>暂无商品，去看点什么吧</view>
 					</view>
 					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

pages/columnGoods/goods_search_con/index.vue

@@ -130,7 +130,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && !loading">
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<text>暂无商品，快去搜索其他商品吧</text>
 					</view>
 					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

pages/commissionedSales/delegation_details/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="content_top">
 			<view class="content_top-one">
-				<image src="@/static/images/dong.gif" mode="aspectFill"></image>
+				<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/dong.gif" mode="aspectFill"></image>
 			</view>
 			<view class="content_top-two">
 				<view class="top-two-one">

pages/index/component/timelist.vue

@@ -88,7 +88,7 @@
 					</view>
 				</view>
 				<view class="conter-img" v-else>
-					<image src="@/static/images/noCart.png" mode="aspectFit"></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" mode="aspectFit"></image>
 				</view>
 			</view>
 		</view>

pages/index/index.vue

@@ -182,7 +182,7 @@
         </view>
 
         <view class="conter-img" v-if='productList.length == 0'>
-          <image src="@/static/images/noCart.png" mode="aspectFit"></image>
+          <image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" mode="aspectFit"></image>
         </view>
 
         <view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>

pages/nongKe/cloud_entrepot/index.vue

@@ -197,7 +197,7 @@
 						<view v-else>
 							<view class="empty">
 								<view class="info">
-									<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+									<u--image :showLoading="true" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" width="400.09rpx"
 										height="400.09rpx"></u--image>
 									<view class="" style="text-align: center;color:#999">
 										暂无商品
@@ -270,7 +270,7 @@
 					</view> -->
 							<view class="yuncangempty">
 
-								<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+								<u--image :showLoading="true" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" width="400.09rpx"
 									height="400.09rpx"></u--image>
 								<view class="" style="text-align: center;color:#999">
 									当前区域暂无云仓
@@ -289,7 +289,7 @@
 			<view style="padding: 10rpx;">
 
 				<view class="info">
-					<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+					<u--image :showLoading="true" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" width="400.09rpx"
 						height="400.09rpx"></u--image>
 					<view class="" style="text-align: center;color:#999">
 						当前区域暂无云仓

pages/nongKe/cloud_entrepot/indexa.vue

@@ -157,7 +157,7 @@
 							<view v-else>
 								<view class="empty">
 									<view class="info">
-										<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+										<u--image :showLoading="true" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" width="400.09rpx"
 											height="400.09rpx"></u--image>
 									</view>
 								</view>
@@ -226,7 +226,7 @@
 		<view class="empty" style="" v-else>
 			<view style="height: var(--status-bar-height);"></view>
 			<view class="info">
-				<u--image :showLoading="true" src="/static/images/noCart.png" width="400.09rpx"
+				<u--image :showLoading="true" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png" width="400.09rpx"
 					height="400.09rpx"></u--image>
 			</view>
 

pages/nongKe/food/index.vue

@@ -252,7 +252,7 @@
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
 		</view>

pages/nongKe/food/indexa.vue

@@ -2,8 +2,6 @@
 	<view class="box">
 		<view class="head">
 			<view style="height: var(--status-bar-height);"></view>
-			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
-				height="748.25rpx" @click="click"></u--image> -->
 			<view class="head_tit">
 				<view class="head_tit_l">
 					<view class="iconfont icon-xiangzuo"></view>
@@ -177,8 +175,6 @@
 
 <style lang="scss" scoped>
 	.head {
-		// background-color: #F94621;
-		// background: url('/static/images/MYTC/BG.png') no-repeat;
 		padding: 20rpx;
 		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
 

pages/nongKe/goods_list/index.vue

@@ -82,7 +82,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue' style="margin: 60rpx auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<view>暂无商品</view>
 					</view>
 					<!-- <recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend> -->

pages/nongKe/specialty/index.vue

@@ -255,7 +255,7 @@
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
 		</view>

pages/nongKe/specialty/indexa.vue

@@ -2,8 +2,6 @@
 	<view class="box">
 		<view class="head">
 			<view style="height: var(--status-bar-height);"></view>
-			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
-				height="748.25rpx" @click="click"></u--image> -->
 			<view class="head_tit">
 				<view class="head_tit_l">
 					<view class="iconfont icon-xiangzuo"></view>
@@ -22,10 +20,6 @@
 
 			<view class="head_serch">
 				<view style="position: relative;">
-					<!-- 	<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
-						v-model="keyword" class="serch_cls"></u-search> -->
-					<!-- 	<u--image class="img_cls" style="position: absolute; top: 3px;right: 3px;" :showLoading="true"
-						src="/static/images/MYTC/SS.png" width="115.65rpx" height="56.82rpx"></u--image> -->
 				</view>
 			</view>
 
@@ -184,7 +178,6 @@
 <style lang="scss" scoped>
 	.head {
 		// background-color: #F94621;
-		background: url('/static/images/MYTC/BG.png') no-repeat;
 		padding: 20rpx;
 		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
 

pages/nongKe/supply_chain/supplier.vue

@@ -289,7 +289,7 @@
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 			<view class='pictrue' style="margin: 0 auto;background-color: #F5F5F5;">
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
 		</view>

pages/nongKe/supply_chain/supplierA.vue

@@ -259,7 +259,7 @@
 			</view>
 			<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 				<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
-					<image src='../../../static/images/noCart.png'></image>
+					<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 					<text>暂无店铺，快去搜索其他店铺吧</text>
 				</view>
 			</view>

pages/nongKe/supply_chain/suppliers.vue

@@ -178,7 +178,7 @@
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 			<view class='pictrue' style="margin: 0 auto;">
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
 		</view>

pages/nongKe/tourism/index.vue

@@ -255,7 +255,7 @@
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 			<view class='pictrue' style="margin: 0 auto;background-color: #F0F2F5;">
-				<image src='../../../static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
 		</view>

pages/nongKe/tourism/indexa.vue

@@ -2,8 +2,6 @@
 	<view class="box">
 		<view class="head">
 			<view style="height: var(--status-bar-height);"></view>
-			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
-				height="748.25rpx" @click="click"></u--image> -->
 			<view class="head_tit">
 				<view class="head_tit_l">
 					<view class="iconfont icon-xiangzuo"></view>
@@ -173,7 +171,6 @@
 <style lang="scss" scoped>
 	.head {
 		// background-color: #F94621;
-		// background: url('/static/images/MYTC/BG.png') no-repeat;
 		padding: 20rpx;
 		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
 

pages/order_addcart/order_addcart.vue

@@ -104,7 +104,7 @@
 			<view class='noCart' v-if="recommend"
 				:style="{marginTop:cartList.invalid.length ==0 && cartList.invalid.length ==0?'170rpx':'' }">
 				<view class='pictrue'>
-					<image src='../../static/images/noCart.png'></image>
+					<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 					<view>暂无商品，去添加点什么吧</view>
 				</view>
 				<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>

pages/store/applicationRecord/index.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class='no-shop' v-if="!listData.length && !loading">
 			<view class='pictrue' style="margin: 0 auto;">
-				<image src='/static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<text>暂无申请记录，快去申请入驻吧!</text>
 			</view>
 		</view>

pages/store/list/index.vue

@@ -108,7 +108,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 					<view class='pictrue'>
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<view>暂无商品，去看点什么吧</view>
 					</view>
 					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct"></recommend>

pages/store/shopStreet/index.vue

@@ -165,7 +165,7 @@
 				</view>
 				<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='../../../static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<text>暂无店铺，快去搜索其他店铺吧</text>
 					</view>
 				</view>

pages/users/user_goods_collection/index.vue

@@ -86,7 +86,7 @@
 		</block>
 		<view class='noCommodity' v-if="(!collectProductList.length && tabIndex == 1) || (!storeList.length && tabIndex == 2)">
 			<view class='pictrue'>
-				<image src='@/static/images/noCart.png'></image>
+				<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 				<view>{{tabIndex == 1 ? '暂无商品' : '暂无店铺'}}，去添加点什么吧</view>
 			</view>
 			

pages/wholesale/wholesale/wholesale.vue

@@ -57,7 +57,7 @@
 				</view>
 				<view class='noCommodity' v-if="productList.length==0 && !loading">
 					<view class='pictrue' style="margin: 0 auto;">
-						<image src='/static/images/noCart.png'></image>
+						<image src='https://lihai001.oss-cn-chengdu.aliyuncs.com/def/noCart.png'></image>
 						<text>暂无商品，快去搜索其他商品吧</text>
 					</view>
 					<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend>

static/images/tabbar/iconfont.css

@@ -1,232 +0,0 @@
-@font-face {
-  font-family: "iconfont2";
-  /* Project id 3861260 */
-  src: url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.woff2?t=1683356048406') format('woff2'),
-    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.woff?t=1683356048406') format('woff'),
-    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.ttf?t=1683356048406') format('truetype'),
-    url('//at.alicdn.com/t/c/font_3861260_kcyv21x2z6e.svg?t=1683356048406#iconfont2') format('svg');
-}
-
-.iconfont2 {
-  font-family: "iconfont2" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.custom-icona-zu2901:before {
-  content: "\e648";
-}
-
-.custom-iconoasa1:before {
-  content: "\e649";
-}
-
-.custom-icongengduo:before {
-  content: "\e64a";
-}
-
-.custom-iconyijian:before {
-  content: "\e644";
-}
-
-.custom-icongongzi:before {
-  content: "\e645";
-}
-
-.custom-iconwendang:before {
-  content: "\e646";
-}
-
-.custom-iconweixin:before {
-  content: "\e647";
-}
-
-.custom-iconoaha:before {
-  content: "\e634";
-}
-
-.custom-iconoamy:before {
-  content: "\e635";
-}
-
-.custom-iconoamya:before {
-  content: "\e63e";
-}
-
-.custom-iconoasa:before {
-  content: "\e63f";
-}
-
-.custom-iconoara:before {
-  content: "\e640";
-}
-
-.custom-iconoar:before {
-  content: "\e641";
-}
-
-.custom-iconoah:before {
-  content: "\e642";
-}
-
-.custom-iconoas:before {
-  content: "\e643";
-}
-
-.custom-iconhangye:before {
-  content: "\e636";
-}
-
-.custom-iconhangye-a:before {
-  content: "\e637";
-}
-
-.custom-iconxinwen:before {
-  content: "\e638";
-}
-
-.custom-icongonying:before {
-  content: "\e639";
-}
-
-.custom-icongonying-a:before {
-  content: "\e63a";
-}
-
-.custom-iconmy-a:before {
-  content: "\e63b";
-}
-
-.custom-iconxiaoxi-a:before {
-  content: "\e63c";
-}
-
-.custom-iconmy:before {
-  content: "\e63d";
-}
-
-.custom-iconchuang:before {
-  content: "\e631";
-}
-
-.custom-iconyouhuiquan:before {
-  content: "\e632";
-}
-
-.custom-iconmeishi:before {
-  content: "\e633";
-}
-
-.custom-iconsmfw:before {
-  content: "\e62c";
-}
-
-.custom-iconzxyy:before {
-  content: "\e62d";
-}
-
-.custom-iconzxjd:before {
-  content: "\e62e";
-}
-
-.custom-iconhtqd:before {
-  content: "\e62f";
-}
-
-.custom-iconzxsg:before {
-  content: "\e630";
-}
-
-.custom-iconhbxs:before {
-  content: "\e622";
-}
-
-.custom-iconmsgy:before {
-  content: "\e623";
-}
-
-.custom-iconylbj:before {
-  content: "\e624";
-}
-
-.custom-iconfwzx:before {
-  content: "\e625";
-}
-
-.custom-iconjypx:before {
-  content: "\e626";
-}
-
-.custom-iconshfw:before {
-  content: "\e627";
-}
-
-.custom-iconnfcp:before {
-  content: "\e628";
-}
-
-.custom-iconsczl:before {
-  content: "\e629";
-}
-
-.custom-iconscfw:before {
-  content: "\e62a";
-}
-
-.custom-iconwyly:before {
-  content: "\e62b";
-}
-
-.custom-iconmdtj:before {
-  content: "\e615";
-}
-
-.custom-iconxjjb:before {
-  content: "\e616";
-}
-
-.custom-iconcmtxl:before {
-  content: "\e617";
-}
-
-.custom-iconcunwu:before {
-  content: "\e618";
-}
-
-.custom-iconysdt:before {
-  content: "\e619";
-}
-
-.custom-icongsrz:before {
-  content: "\e61a";
-}
-
-.custom-icongstz:before {
-  content: "\e61b";
-}
-
-.custom-iconxzcg:before {
-  content: "\e61c";
-}
-
-.custom-iconcaiwu:before {
-  content: "\e61d";
-}
-
-.custom-iconshce:before {
-  content: "\e61e";
-}
-
-.custom-iconsqhf:before {
-  content: "\e61f";
-}
-
-.custom-iconxxlr:before {
-  content: "\e620";
-}
-
-.custom-icondangwu:before {
-  content: "\e621";
-}