Home Explore Help
Register Sign In
cmy
/
CBB3
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改文字

xiaol 1 month ago
parent
68ea0bbd1b
commit
4792638ca7
32 changed files with 12 additions and 13 deletions
Unified View Show Diff Stats
  1. 5 8
      pages/guild/index.vue
  2. 4 2
      pages/index/index.vue
  3. 2 2
      pages/user/detail/anticipate_gift.vue
  4. BIN
      static/img/img01.png
  5. 1 1
      unpackage/dist/build/web/index.html
  6. BIN
      unpackage/dist/build/web/static/img/img01.png
  7. 0 0
      unpackage/dist/build/web/static/js/index.09c1f155.js
  8. 0 0
      unpackage/dist/build/web/static/js/index.5956605e.js
  9. 0 0
      unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-apply-sqInfo~pages-chat-chat~pages-chat-chatGroup~pages-chat-collec~1677ec72.1e030383.js
  10. 0 0
      unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-apply-sqInfo~pages-chat-chat~pages-chat-chatGroup~pages-chat-collec~dd6b0d1f.9cb64095.js
  11. 0 0
      unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-chat~pages-chat-chatGroup~pages-chat-collection-transmit~pages-chat~49fd1942.5f93950e.js
  12. 0 0
      unpackage/dist/build/web/static/js/pages-chat-chat.550d5c00.js
  13. 0 0
      unpackage/dist/build/web/static/js/pages-chat-chatGroup.391a6117.js
  14. 0 0
      unpackage/dist/build/web/static/js/pages-chat-chatGroup~pages-chat-group-add~pages-chat-group-info-groupInfo-jddNo~pages-chat-index~pag~19b558ce.2e593ca6.js
  15. 0 0
      unpackage/dist/build/web/static/js/pages-chat-collection-collect.ed0fe1ca.js
  16. 0 0
      unpackage/dist/build/web/static/js/pages-chat-group-info-groupInfo.8a6d9858.js
  17. 0 0
      unpackage/dist/build/web/static/js/pages-chat-group-info-groupInfo.bafb84ed.js
  18. 0 0
      unpackage/dist/build/web/static/js/pages-guild-index.042905f3.js
  19. 0 0
      unpackage/dist/build/web/static/js/pages-guild-index.4a37852b.js
  20. 0 0
      unpackage/dist/build/web/static/js/pages-guild-index~pages-index-index~pages-login-forgotPassword~pages-login-index~pages-login-registe~71a2f5f7.b4629803.js
  21. 0 0
      unpackage/dist/build/web/static/js/pages-guild-itemIndex.79071983.js
  22. 0 0
      unpackage/dist/build/web/static/js/pages-guild-proItem.56440743.js
  23. 0 0
      unpackage/dist/build/web/static/js/pages-guild-proItem.d6ce86e0.js
  24. 0 0
      unpackage/dist/build/web/static/js/pages-index-index.bf7dc55c.js
  25. 0 0
      unpackage/dist/build/web/static/js/pages-index-index.dd731e9e.js
  26. 0 0
      unpackage/dist/build/web/static/js/pages-login-register.ddfee121.js
  27. 0 0
      unpackage/dist/build/web/static/js/pages-login-register.f57484ef.js
  28. 0 0
      unpackage/dist/build/web/static/js/pages-user-detail-anticipate_gift.223f6494.js
  29. 0 0
      unpackage/dist/build/web/static/js/pages-user-detail-anticipate_gift.d6a4318c.js
  30. 0 0
      unpackage/dist/build/web/static/js/pages-user-index.6577812e.js
  31. 0 0
      unpackage/dist/build/web/static/js/pages-user-index.b6383132.js
  32. BIN
      unpackage/dist/build/web/web.zip

+ 5 - 8
pages/guild/index.vue
View File 

@@ -1,6 +1,7 @@
 
 <template>
 
 <template>
 
 	<view>
 
 	<view>
 
-		<view class="app-bg">
 
+		<image src="/static/img/img01.png" style="width: 750rpx;height: 100%;" mode="widthFix"></image>
 
+		<!-- <view class="app-bg">
 
 			<image src="/static/img/tream_bg.png"></image>
 
 			<image src="/static/img/tream_bg.png"></image>
 
 		</view>
 
 		</view>
 
 		<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" fixed title="我的会馆"></uni-nav-bar>
 
 		<uni-nav-bar color="#fff" :border="false" statusBar backgroundColor="transparent" fixed title="我的会馆"></uni-nav-bar>
 
@@ -16,8 +17,8 @@
 
 				nextMargin="15"
 
 				nextMargin="15"
 
 				indicatorMode="line"
 
 				indicatorMode="line"
 
 			></u-swiper>
 
 			></u-swiper>
 
-		</view>
 
-		<view class="app-body" v-if="user != null">
 
+		</view> -->
 
+		<!-- <view class="app-body" v-if="user != null">
 
 			<view class="pannel fx-r fx-bc fx-ac" v-if="sysData.is_audit == 0">
 
 			<view class="pannel fx-r fx-bc fx-ac" v-if="sysData.is_audit == 0">
 
 				
 				
 				<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/integral">
 
 				<view class="item fx-h fx-bc fx-ac" @tap="tapOpen" data-url="/pages/user/detail/integral">
 
@@ -122,14 +123,12 @@
 
 					
 					
 					
 					
 					
 					
-					<!--未到预约时间-->
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 0">
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 0">
 
 						<view class="time1 fx-r" style="color: #787878;">预约时间:{{ utils.date('m-d H:i',item.add_time) }}</view>
 
 						<view class="time1 fx-r" style="color: #787878;">预约时间:{{ utils.date('m-d H:i',item.add_time) }}</view>
 
 						<view class="fx-g1"></view>
 
 						<view class="fx-g1"></view>
 
 						<view class="sbtn-no">未到预约时间</view>
 
 						<view class="sbtn-no">未到预约时间</view>
 
 					</view>
 
 					</view>
 
 					
 					
-					<!--预约时间-->
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 1">
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 1">
 
 						<view class="time1 fx-r">
 
 						<view class="time1 fx-r">
 
 							距预约结束:<countdown  :startTime="utils.date('Y-m-d H:i:s')" :endTime="utils.date('Y-m-d H:i:m',item.end_time)" />
 
 							距预约结束:<countdown  :startTime="utils.date('Y-m-d H:i:s')" :endTime="utils.date('Y-m-d H:i:m',item.end_time)" />
 
@@ -139,7 +138,6 @@
 
 						<view class="sbtn-no" v-else>已预约</view>
 
 						<view class="sbtn-no" v-else>已预约</view>
 
 					</view>
 
 					</view>
 
 					
 					
-					<!-- 预约时间结束 - 入场时间  -->
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 2">
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 2">
 
 						<view class="time1 fx-r" style="color: #787878;">入场时间:{{ utils.date('m-d H:i',item.radd_time) }}</view>
 
 						<view class="time1 fx-r" style="color: #787878;">入场时间:{{ utils.date('m-d H:i',item.radd_time) }}</view>
 
 						<view class="fx-g1"></view>
 
 						<view class="fx-g1"></view>
 
@@ -148,7 +146,6 @@
 
 					
 					
 					
 					
 					
 					
-					<!-- 可以入场时间 -->
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 3">
 
 					<view class="yfoot fx-r fx-bc" v-if="item.showType == 3">
 
 						
 						
 						<template  v-if="item.booking_count > 0">
 
 						<template  v-if="item.booking_count > 0">
 
@@ -225,7 +222,7 @@
 
 					</view>
 
 					</view>
 
 					
 					
 				
 				
-				</u-modal>
 
+				</u-modal> -->
 
 		
 		
 	</view>
 
 	</view>
 
 </template>
 
 </template>

+ 4 - 2
pages/index/index.vue
View File 

@@ -185,7 +185,7 @@
 
 				<view class="shop" v-if="sysData.is_audit == 0">
 
 				<view class="shop" v-if="sysData.is_audit == 0">
 
 					<view class="top fx-r fx-bc fx-ac">
 
 					<view class="top fx-r fx-bc fx-ac">
 
 						<image class="icon" src="/static/img/shop-icon.png"></image>
 
 						<image class="icon" src="/static/img/shop-icon.png"></image>
 
-						<view class="label">易趣C果园({{merchantData.length}}家)</view>
 
+						<view class="label">易趣C果园({{merchantCount}}家)</view>
 
 						<view class="fx-g1"></view>
 
 						<view class="fx-g1"></view>
 
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../merchant/list">
 
 						<view class="more fx-r fx-bc fx-ac" @tap="tapOpen" data-url="../merchant/list">
 
 							<view class="text">更多</view>
 
 							<view class="text">更多</view>
 
@@ -298,6 +298,7 @@
 
 				gGid: 0,
 
 				gGid: 0,
 
 				merchantData: [],
 
 				merchantData: [],
 
 				guData: null,
 
 				guData: null,
 
+				merchantCount:0,
 
 				page: {
 
 				page: {
 
 					page: 1,
 
 					page: 1,
 
 					isLoad: false,
 
 					isLoad: false,
 
@@ -513,7 +514,8 @@
 
 					.then(res => {
 
 					.then(res => {
 
 						uni.hideLoading();
 
 						uni.hideLoading();
 
 						if (res.code == 200) {
 
 						if (res.code == 200) {
 
-							this.merchantData = res.data;
 
+							this.merchantData = res.data.result;
 
+							this.merchantCount = res.data.count;
 
 							this.page.isFoot = true;
 
 							this.page.isFoot = true;
 
 							this.isLoad = true;
 
 							this.isLoad = true;
 
 						}
 
 						}

+ 2 - 2
pages/user/detail/anticipate_gift.vue
View File 

@@ -63,9 +63,9 @@
 
 				<view class="etb-left">
 
 				<view class="etb-left">
 
 					<input placeholder="请输入转账金额" @blur="tapBlur" placeholder-class="placeholder-class" v-model="num" />
 
 					<input placeholder="请输入转账金额" @blur="tapBlur" placeholder-class="placeholder-class" v-model="num" />
 
 				</view>
 
 				</view>
 
-				<view class="etb-right" @click="num = allMoney()">
 
+				<!-- <view class="etb-right" @click="num = allMoney()">
 
 					<text>全部</text>
 
 					<text>全部</text>
 
-				</view>
 
+				</view> -->
 
 			</view>
 
 			</view>
 
 		</view>
 
 		</view>
 
 		<u-alert title="温馨提示" type = "warning" description = "转账金额必须100倍数!"></u-alert>
 
 		<u-alert title="温馨提示" type = "warning" description = "转账金额必须100倍数!"></u-alert>

BIN
static/img/img01.png
View File


+ 1 - 1
unpackage/dist/build/web/index.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>CBB</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>CBB</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script><div id=app></div><script src=/h5/static/js/chunk-vendors.f6948fc5.js></script><script src=/h5/static/js/index.5956605e.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
 
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script><div id=app></div><script src=/h5/static/js/chunk-vendors.f6948fc5.js></script><script src=/h5/static/js/index.09c1f155.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
 
 	var noddy, remotes = false;
 
 	var noddy, remotes = false;
 
 	document.addEventListener('click', function(event) {
 
 	document.addEventListener('click', function(event) {
 
 		noddy = event.target;
 
 		noddy = event.target;

BIN
unpackage/dist/build/web/static/img/img01.png
View File


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/index.09c1f155.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/index.5956605e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-apply-sqInfo~pages-chat-chat~pages-chat-chatGroup~pages-chat-collec~1677ec72.1e030383.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-apply-sqInfo~pages-chat-chat~pages-chat-chatGroup~pages-chat-collec~dd6b0d1f.9cb64095.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-apply-list~pages-chat-chat~pages-chat-chatGroup~pages-chat-collection-transmit~pages-chat~49fd1942.5f93950e.js


+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-chat.8a3e9ed2.js → unpackage/dist/build/web/static/js/pages-chat-chat.550d5c00.js
View File


+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-chatGroup.b725bebd.js → unpackage/dist/build/web/static/js/pages-chat-chatGroup.391a6117.js
View File


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-chatGroup~pages-chat-group-add~pages-chat-group-info-groupInfo-jddNo~pages-chat-index~pag~19b558ce.2e593ca6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-collection-collect.ed0fe1ca.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-group-info-groupInfo.8a6d9858.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-chat-group-info-groupInfo.bafb84ed.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-index.042905f3.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-index.4a37852b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-index~pages-index-index~pages-login-forgotPassword~pages-login-index~pages-login-registe~71a2f5f7.b4629803.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-itemIndex.79071983.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-proItem.56440743.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-guild-proItem.d6ce86e0.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-index-index.bf7dc55c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-index-index.dd731e9e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-login-register.ddfee121.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-login-register.f57484ef.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-user-detail-anticipate_gift.223f6494.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-user-detail-anticipate_gift.d6a4318c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-user-index.6577812e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/web/static/js/pages-user-index.b6383132.js


BIN
unpackage/dist/build/web/web.zip
View File


Some files were not shown because too many files changed in this diff