Merge branch 'main' of http://git.njrzwl.cn:3000/liudan/huitong

# Conflicts:
#	manifest.json

components/passwordPopup/index.vue

@@ -131,7 +131,7 @@
 
 <style scoped lang="scss">
 	.password-window {
-		background-image: url('http://b2.njrenzhou.com/static/images/passwordPop.png');
+		background-image: url('https://admin.huitongzx.cn/static/images/passwordPop.png');
 		background-repeat: no-repeat;
 		background-size: 100% 100%;
 		background-color: #fff;

config/app.js

@@ -6,7 +6,7 @@ let openPlantGrass = '-openPlantGrass-'
 
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' //测试
-let httpApi = 'https://b2.njrenzhou.com/' //生产
+let httpApi = 'https://admin.huitongzx.cn/' //生产
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'

main.js

@@ -18,7 +18,7 @@ import BaseMoney from './components/BaseMoney.vue';
 Vue.component('skeleton', skeleton)
 Vue.component('BaseMoney', BaseMoney)
 Vue.prototype.$util = util;
-Vue.prototype.basePicPath = 'http://b2.njrenzhou.com';
+Vue.prototype.basePicPath = 'https://admin.huitongzx.cn/';
 Vue.prototype.$Cache = Cache;
 Vue.prototype.$eventHub = new Vue();
 Vue.config.productionTip = false

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "惠通甄享",
+    "name" : "惠通臻享",
     "appid" : "__UNI__39548CA",
     "description" : "",
     "versionName" : "1.0.4",

pages/index/component/headerSerch.vue

@@ -184,7 +184,7 @@
 		/* #endif */
 		// background-color: #fff;
 		background-size: cover;
-		background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
+		background-image: url(https://admin.huitongzx.cn/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
 		// margin-bottom: 24rpx;
 		.indexTitle{
 			margin:0 24rpx;

pages/index/component/swiperBg.vue

@@ -132,7 +132,7 @@
 	.swiperBg {
 		position: relative;
 		// background: #fff;
-		background-image: url(http://b2.njrenzhou.com/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
+		background-image: url(https://admin.huitongzx.cn/uploads/def/20240314/ebc9ea0e40ac396e6c768d56fd3a1a36.png);
 		z-index: 1;
 		background-size: cover;
 		background-position: bottom;

pages/shop/shop.vue

@@ -11,7 +11,7 @@
 				<view style="text-align: right;" v-if="tabIndex==1" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"'
 				 @click='Changswitch'></view>
 				  <!-- @click="showMaoLocation(latitude,longitude)" -->
-				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view>
+				<!-- <view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view> -->
 				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索' placeholder-class='placeholder' confirm-type='search' name="search" v-model='where.keyword'
 					 @confirm="searchSubmit"></input>

pages/shop/shop1.vue

@@ -11,7 +11,7 @@
 				<view style="text-align: right;" v-if="tabIndex==1" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"'
 				 @click='Changswitch'></view>
 				  <!-- @click="showMaoLocation(latitude,longitude)" -->
-				<view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view>
+				<!-- <view v-else-if="mer_location == 1" style="text-align: right;" class='iconfont icon-dingwei'></view> -->
 				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
 					<input placeholder='搜索' placeholder-class='placeholder' confirm-type='search' name="search" v-model='where.keyword'
 					 @confirm="searchSubmit"></input>

pages/user/index.vue

@@ -343,13 +343,13 @@
 				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
 				orderMenu: [{
 						// icon: 'icon-daifukuan1',
-						icon:'http://b2.njrenzhou.com/uploads/def/20240310/d513b476a68d22949906e72a041cb156.png',
+						icon:'https://admin.huitongzx.cn/uploads/def/20240310/d513b476a68d22949906e72a041cb156.png',
 						title: '待付款',
 						url: '/pages/users/order_list/index?status=0',
 						num: 0
 					},
 					{
-						icon:'http://b2.njrenzhou.com/uploads/def/20240310/235ede9ae7c8ce44bb8a7d97f5a144fa.png',
+						icon:'https://admin.huitongzx.cn/uploads/def/20240310/235ede9ae7c8ce44bb8a7d97f5a144fa.png',
 						// icon: 'icon-daifahuo1',
 						title: '待发货',
 						url: '/pages/users/order_list/index?status=1',
@@ -357,21 +357,21 @@
 					},
 					{
 						// icon: 'icon-daishouhuo1',
-						icon:'http://b2.njrenzhou.com/uploads/def/20240310/e64f2f0d7c1ece0a5de189ebf6b734c3.png',
+						icon:'https://admin.huitongzx.cn/uploads/def/20240310/e64f2f0d7c1ece0a5de189ebf6b734c3.png',
 						title: '待收货',
 						url: '/pages/users/order_list/index?status=2',
 						num: 0
 					},
 					{
 						// icon: 'icon-daipingjia1',
-						icon:'http://b2.njrenzhou.com/uploads/def/20240310/836207205f1cfaa861979b3f22300c27.png',
+						icon:'https://admin.huitongzx.cn/uploads/def/20240310/836207205f1cfaa861979b3f22300c27.png',
 						title: '待评价',
 						url: '/pages/users/order_list/index?status=3',
 						num: 0
 					},
 					{
 						// icon: 'icon-a-shouhoutuikuan1',
-						icon:'http://b2.njrenzhou.com/uploads/def/20240310/af109e9a9005bae9b74608f11a3cc8c7.png',
+						icon:'https://admin.huitongzx.cn/uploads/def/20240310/af109e9a9005bae9b74608f11a3cc8c7.png',
 						title: '售后/退款',
 						url: '/pages/users/refund/list',
 						num: 0
@@ -441,6 +441,7 @@
 			if (that.isLogin) {
 				this.getUserInfo();
 				this.orderNum();
+				
 			} else {
 				this.userInfo = {}
 				this.orderMenu.forEach(v=>{
@@ -598,6 +599,7 @@
 				this.getUserInfo();
 				this.getMyMenus();
 				this.orderNum();
+				
 				this.isShowAuth = false;
 
 			},
@@ -631,6 +633,7 @@
 						that.$set(that.assets,item,Math.floor(res.data.assets[item]));
 						
 					})
+					that.spreadPeopleHandle()
 					
 					that.getMyMenus();
 				});

pages/users/feedback/index.vue

@@ -1,13 +1,22 @@
 <template>
 	<view :style="viewColor" style="background: #F5F5F7;padding-bottom: 200rpx;">
 		<view class="tips" v-if="is_open_service == 1">
-			<view class="tipBox" @click="toChat">
+			<button open-type="contact">
+				<view class="tipBox">
+					<view class="left">
+						
+						<view class="font">如需尽快解决问题，可直接联系在线客服</view>
+					</view>
+					<view><i class='iconfont icon-xiangyou' style="fontSize: 24rpx;"></i></view>
+				</view>
+			</button>
+			<!-- <view class="tipBox" @click="toChat">
 				<view class="left">
-					<!-- <image :src="`${domain}/static/images/kefu.png`" mode=""></image> -->
+					
 					<view class="font">如需尽快解决问题，可直接联系在线客服</view>
 				</view>
 				<view><i class='iconfont icon-xiangyou' style="fontSize: 24rpx;"></i></view>
-			</view>
+			</view> -->
 		</view>
 		<view class="feedback-container">
 			<view class="item-box">

pages/users/promoter-list/index.vue

@@ -21,7 +21,7 @@
 				</view>
 				<!-- <button class='iconfont icon-sousuo2' @click="submitForm"></button> -->
 			</view>
-			<view class='list'>
+			<view class='list' v-if="recordList.length!=0">
 				<!-- <view class="sortNav acea-row row-middle">	
 					<view class="sortItem" @click='setSort("spread_count ASC")' v-if="sort == 'spread_count DESC'">团队排序
 						<image :src="domain+'/static/diy/sort1'+keyColor+'.png'"></image>
@@ -62,10 +62,10 @@
 									<view class="name">
 										{{item.nickname}}
 									</view>
-									<view class="recomText">
+									<!-- <view class="recomText">
 										<image src="/static/images/reco.png" mode=""></image>
 										<text>初级代理</text>
-									</view>
+									</view> -->
 								</view>
 								
 								<view class="phone">
@@ -79,7 +79,7 @@
 							</view> -->
 						</view>
 						<view class="right">
-							<view>加入时间: <text>{{item.create_time}}</text></view>
+							<view>注册时间: <text>{{item.create_time}}</text></view>
 							<!-- <view><text class='num t-color'>{{item.spread_count ? item.spread_count : 0}}</text>人</view> -->
 							<!-- <view><text class="num">{{item.pay_count ? item.pay_count : 0}}</text>单</view> -->
 							<!-- <view><text class="num">{{item.pay_price ? item.pay_price : 0}}</text>元</view> -->
@@ -87,6 +87,10 @@
 					</view>
 				</block>
 			</view>
+			<view class="emptyBox" v-if="recordList.length==0">
+				<image src="/static/images/empty-box.png" mode="widthFix"></image>
+				<text>暂无数据</text>
+			</view>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 	</view>
@@ -399,6 +403,20 @@
 		display: flex;
 		align-items: center;
 	}
+	.emptyBox{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		margin-top: calc(20vh);
+		image{
+			width: 50%;
+			height: auto;
+		}
+		text{
+			margin-top:20rpx;
+		}
+	}
 	
 
 	// .promoter-list .list .item .right .num{

pages/users/user_address/index.vue

@@ -379,6 +379,7 @@
 		top: 15rpx;
 		text-align: center;
 		font-size: 20rpx;
+		z-index:999;
 		.iconfont{
 			color: var(--view-theme);
 		}