Browse Source

2024-12-25

cmy 1 month ago
parent
commit
44ddb39d08

+ 1 - 1
androidPrivacy.json

@@ -7,7 +7,7 @@
     "buttonRefuse" : "暂不同意",
     "second" : {
         "title" : "确认提示",
-        "message" : "  进入应用前,你需先同意<a href=\"https://apps.yiqucbb.cn/h5/#/pages/operation/user\">《服务协议》</a>和<a href=\"https://apps.yiqucbb.cn/h5/#/pages/operation/agreement\">《隐私政策》</a>\t",
+        "message" : "  进入应用前,你需先同意<a href=\"https://apps.ccyqc.com/h5/#/pages/operation/user\">《服务协议》</a>和<a href=\"https://apps.ccyqc.com/h5/#/pages/operation/agreement\">《隐私政策》</a>\t",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

+ 2 - 0
components/gaoyia-parse/components/wxParseImg.vue

@@ -4,6 +4,7 @@
 		:lazy-load="node.attr.lazyLoad"
 		:class="node.classStr"
 		:style="newStyleStr || node.styleStr"
+		style="display: inline-block !important;"
 		:data-src="node.attr.src"
 		:src="node.attr.src"
 		@tap="wxParseImgTap"
@@ -59,6 +60,7 @@ export default {
 
 			this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`;//删除padding
 			// this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px;`;
+			console.log(this.node,'this.node')
 		},
 		// 计算视觉优先的图片宽高
 		wxAutoImageCal(originalWidth, originalHeight) {

+ 13 - 10
config/global.js

@@ -1,16 +1,19 @@
 export default {
 	//web通讯
-	wsSocketUrl		: "wss://im.yiqucbb.cn/phone",
+	wsSocketUrl: "wss://im.ccyqc.com/phone",
+	appRequestUrl: "https://apps.ccyqc.com",
 	//缓存值
-	cachekey		:  "appview",
-	
-	putoken		 	:  "u$ii#uH!uF7LJkz&a4fcE50AdzHIbBAH",
-	
-	version			:  "0.0.1",
-	
-	app_code		: 1,
-	
-	apiHttps		: [
+	cachekey: "appview",
+
+	putoken: "u$ii#uH!uF7LJkz&a4fcE50AdzHIbBAH",
+
+	version: "0.0.1",
+
+	app_code: 1,
+
+	apiHttps: [
+		'https://newcbb.ccyqc.com/',
+		'https://djdfg.ccyqc.com/',
 		"https://ifl23dfjjdddfl.yiqucbb.cn/",
 		"https://newcbb.yiqucbb.cn/"
 	]

+ 37 - 7
library/upapp.js

@@ -12,7 +12,7 @@ export default function initSys() {
 						code: versionCode
 					})
 					.then(res => {
-						console.log(res.data.app_code,8888)
+						// console.log(res.data, 8888)
 						if (res.code == 200) {
 							if (appType != "ios") {
 								if (wgtinfo.versionCode < res.data.app_code) {
@@ -26,14 +26,44 @@ export default function initSys() {
 										btnBgColor: "#ff3300", //设置按钮背景色颜色
 										updateBtnText: "升级", //升级按钮文字,默认为立即升级
 										topImgBg: "", //非必填,用于自定义;自定义方法请参考demo,
-										hidBackBtn: true, //可选 默认为false(即会显示后台更新按钮), 设置android 整包更新弹框是否显示后台更新按钮,这个只有android整包更新才有这个参数,热更新是是无法设置的。
-										verCode: res.data
-											.app_version, //最新apk版本号 可选  用于Android整包升级,避免用户取消安装apk时,重复下载问题,如果不传的话,apk将会重新下载,
 										downMsgTip: "资源下载中,请稍后...", //可选(android)
-										goBackBtnText: "进入后台", //可选(android)
 									};
-									//必需提供下载地址;
-									upDater.startUpdate(options, () => {});
+									if (res.data.android_url.indexOf('.wgt') > -1) {
+										plus.io.requestFileSystem(plus.io.PUBLIC_DOWNLOADS, function(fobject) {
+											//设置文件下载根路径;	
+											let rootPath = fobject.root.fullPath;
+											upDater.wgtUpdate(options, rootPath, result => {
+												if (result) {
+													var pathNew = plus.io
+														.convertAbsoluteFileSystem(result);
+													// console.log(pathNew);
+													plus.runtime.install(pathNew, {
+														force: false
+													}, function() {
+														//进行重新启动;
+														plus.runtime.restart();
+													}, (e) => {
+														uni.showToast({
+															title: '安装升级包失败' +
+																JSON
+																.stringify(
+																	e),
+															icon: 'none'
+														})
+													});
+												}
+											}, () => {
+												console.log("弹框关闭了");
+											});
+										})
+									} else {
+										options.hidBackBtn = true
+										options.verCode = res.data
+											.app_version //最新apk版本号 可选  用于Android整包升级,避免用户取消安装apk时,重复下载问题,如果不传的话,apk将会重新下载,
+										options.goBackBtnText = "进入后台" //可选(android)
+										//必需提供下载地址;
+										upDater.startUpdate(options, () => {});
+									}
 								} else if (wgtinfo.versionCode > res.data.app_code) {
 									sotre.commit('chnangeSshowData', false);
 								} else {

+ 11 - 11
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "易趣CBB",
-    "appid" : "__UNI__2978829",
+    "name" : "长城易趣",
+    "appid" : "__UNI__EFA020E",
     "description" : "一款电商App",
-    "versionName" : "3.3.5",
-    "versionCode" : 335,
+    "versionName" : "3.3.7",
+    "versionCode" : 337,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -172,8 +172,8 @@
                     "description" : "为了统一两个平台的提示(对话框)框的效果,以及对文字颜色内容的可自定义",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=1497",
-                    "android_package_name" : "com.cbb.cn",
-                    "ios_bundle_id" : "com.yqcbb.name",
+                    "android_package_name" : "com.app.ccyq",
+                    "ios_bundle_id" : "",
                     "isCloud" : true,
                     "bought" : 1,
                     "pid" : "1497",
@@ -186,8 +186,8 @@
                     "description" : "app版本升级(包含热更新)弹框提示和进度显示,apk自动安装,跳转应用市场",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=1371",
-                    "android_package_name" : "com.cbb.cn",
-                    "ios_bundle_id" : "com.yqcbb.name",
+                    "android_package_name" : "com.app.ccyq",
+                    "ios_bundle_id" : "",
                     "isCloud" : true,
                     "bought" : 1,
                     "pid" : "1371",
@@ -200,8 +200,8 @@
                     "description" : "网易易盾验证码",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=1617",
-                    "android_package_name" : "com.cbb.cn",
-                    "ios_bundle_id" : "com.yqcbb.name",
+                    "android_package_name" : "com.app.ccyq",
+                    "ios_bundle_id" : "",
                     "isCloud" : true,
                     "bought" : 1,
                     "pid" : "1617",
@@ -237,7 +237,7 @@
         "router" : {
             "base" : "/h5/"
         },
-        "title" : "CBB",
+        "title" : "长城易趣",
         "template" : "index.html",
         "optimization" : {
             "treeShaking" : {

+ 1 - 1
pages.json

@@ -965,7 +965,7 @@
 			"bounce": "none"
 		},
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "易趣CBB",
+		"navigationBarTitleText": "长城易趣",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}

+ 337 - 163
pages/guild/index.vue

@@ -1,9 +1,13 @@
 <template>
 	<view>
-		<image src="https://apps.yiqucbb.cn/h5/tipImg1.png" style="width: 750rpx;height: 100%;" mode="widthFix"></image>
-		<image src="https://apps.yiqucbb.cn/h5/tipImg2.png" style="width: 750rpx;height: 100%;" mode="widthFix"></image>
-		<image src="https://apps.yiqucbb.cn/h5/tipImg3.png" style="width: 750rpx;height: 100%;" mode="widthFix"></image>
-		<image src="https://apps.yiqucbb.cn/h5/tipImg4.png" style="width: 750rpx;height: 100%;" mode="widthFix"></image>
+		<image :src="appConfig.appRequestUrl+`/h5/tipImg1.png`" style="width: 750rpx;height: 100%;" mode="widthFix">
+		</image>
+		<image :src="appConfig.appRequestUrl+`/h5/tipImg2.png`" style="width: 750rpx;height: 100%;" mode="widthFix">
+		</image>
+		<image :src="appConfig.appRequestUrl+`/h5/tipImg3.png`" style="width: 750rpx;height: 100%;" mode="widthFix">
+		</image>
+		<image :src="appConfig.appRequestUrl+`/h5/tipImg4.png`" style="width: 750rpx;height: 100%;" mode="widthFix">
+		</image>
 		<!-- <view class="app-bg">
 			<image src="/static/img/tream_bg.png"></image>
 		</view>
@@ -41,10 +45,7 @@
 					<view class="count">{{ user != null ? user.anticipate : 0 }}</view>
 					<view class="label">易趣卷</view>
 				</view>
-				
-				
 			</view>
-			
 			<view class="team-buy" v-if="data.guData != null">
 				
 				<view class="team-show">
@@ -223,68 +224,74 @@
 							<view class="nbtn ihover" @tap="isBooking = false">取消</view>
 						</view>
 					</view>
-					
-				
 				</u-modal> -->
-		
 	</view>
 </template>
 
 <script>
+	import appConfig from '../../config/global.js'
 	import countdown from "@/components/cz-countdown/cz-countdown.vue";
 	import uParse from '@/components/gaoyia-parse/parse.vue';
-	import { mapState, mapMutations } from 'vuex';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
 	export default {
 		components: {
 			countdown,
 			uParse
 		},
-		computed: mapState(['user','sysData']),
+		computed: mapState(['user', 'sysData']),
 		data() {
 			return {
-				barheight : 0,
-				data : {
-					guData : null,
-					auction : null
+				appConfig,
+				barheight: 0,
+				data: {
+					guData: null,
+					auction: null
+				},
+				topData: {
+					banner: [],
+					content: ""
 				},
-				topData :{
-					banner  : [],
-					content : ""
-				} ,
-				isShowContent : false,
-				itemData : null,
-				actionType : "",
-				isBooking : false,
-				isSubmit : false,
+				isShowContent: false,
+				itemData: null,
+				actionType: "",
+				isBooking: false,
+				isSubmit: false,
 			}
 		},
 		onLoad() {
 			this.initView();
-			setInterval(this.interval,1000);
+			setInterval(this.interval, 1000);
 		},
-		
+
 		onShow() {
-			this.checkUserLogin({ page: this,isLogion: false,fn:this.uInit});
+			this.checkUserLogin({
+				page: this,
+				isLogion: false,
+				fn: this.uInit
+			});
 		},
-		
+
 		methods: {
 			...mapMutations(['checkUserLogin']),
 			initView: function() {
-				
+
 				this.$nextTick(() => {
-					uni.createSelectorQuery().select("#app-top").boundingClientRect(res=>{
+					uni.createSelectorQuery().select("#app-top").boundingClientRect(res => {
 						this.barheight = res.height;
 					}).exec();
 				});
 				// #ifdef H5
-					this.footHeight = 60;
+				this.footHeight = 60;
 				// #endif	
-				
+
 				this
 					.request
 					.get("guInit")
 					.then(res => {
-						if(res.code == 200) {
+						if (res.code == 200) {
 							this.topData = res.data;
 						}
 					});
@@ -292,7 +299,7 @@
 			/**
 			 * 获取其他信息
 			 */
-			uInit:function(){
+			uInit: function() {
 				this
 					.request
 					.post("getUserGu")
@@ -311,54 +318,58 @@
 			/**
 			 * 预约操作
 			 */
-			tapBooking:function(item){
-				if(this.user == null) {
+			tapBooking: function(item) {
+				if (this.user == null) {
 					uni.navigateTo({
-						url:"/pages/login/index"
+						url: "/pages/login/index"
 					});
-					return ;
+					return;
 				}
 				//是否认证
-				if(this.user.is_auth != 1 ) {
-					this.utils.showModal("您还未认证,点击进行认证",()=>{
+				if (this.user.is_auth != 1) {
+					this.utils.showModal("您还未认证,点击进行认证", () => {
 						uni.navigateTo({
-							url:"/pages/user/approve"
+							url: "/pages/user/approve"
 						});
 					});
 					return;
 				}
 				//是否填写银行信息
-				if(this.user.is_bank != 1) {
-					this.utils.showModal("您还配置收款信息,点击配置",()=>{
+				if (this.user.is_bank != 1) {
+					this.utils.showModal("您还配置收款信息,点击配置", () => {
 						uni.navigateTo({
-							url:"/pages/user/bank/bank"
+							url: "/pages/user/bank/bank"
 						});
 					});
 					return;
 				}
-				
+
 				this.isShowContent = true;
 				this.itemData = item;
 				this.actionType = "booking";
 			},
-			
-			tapAction:function(){
+
+			tapAction: function() {
 				this.isShowContent = false;
-				if(this.actionType == "booking") {
+				if (this.actionType == "booking") {
 					this.isBooking = true;
 				}
 			},
 			/**
 			 * 预约单
 			 */
-			tapBookAc:function(){
+			tapBookAc: function() {
 				this.isBooking = false;
-				if(this.isSubmit) return ;
+				if (this.isSubmit) return;
 				this.isSubmit = true;
-				uni.showLoading({ title: '提交数据..' });
+				uni.showLoading({
+					title: '提交数据..'
+				});
 				this
 					.request
-					.post("auctionSubscribe",{id : this.itemData.id})
+					.post("auctionSubscribe", {
+						id: this.itemData.id
+					})
 					.then(res => {
 						uni.hideLoading();
 						this.isSubmit = false;
@@ -375,25 +386,23 @@
 						uni.hideLoading();
 					});
 			},
-			
-			
 			/**
 			 * 
 			 */
-			tapLogin:function(){
+			tapLogin: function() {
 				uni.navigateTo({
-					url:"../login/index"
+					url: "../login/index"
 				});
 			},
-			tapAdver:function(){
-				
+			tapAdver: function() {
+
 			},
 			/**
 			 * 详情页面
 			 */
-			tapItem:function(item){
+			tapItem: function(item) {
 				uni.navigateTo({
-					url:"./rush?id=" + item.id
+					url: "./rush?id=" + item.id
 				})
 			},
 			/**
@@ -404,38 +413,37 @@
 				let url = ev.currentTarget.dataset.url;
 				this.utils.navigateTo(url);
 			},
-			
-			interval:function(){
-				if(this.data.auction != null) {
+			interval: function() {
+				if (this.data.auction != null) {
 					let time = this.utils.strtotime();
-					for(let i in this.data.auction) {
+					for (let i in this.data.auction) {
 						let d = this.data.auction[i];
 						//判断是否预约时间
-						if(time >= d.add_time && time < d.end_time   ) {
-							this.$set(this.data.auction[i],'showType',1);
+						if (time >= d.add_time && time < d.end_time) {
+							this.$set(this.data.auction[i], 'showType', 1);
 						}
-						
+
 						//入场时间
-						if(time >= d.end_time && time < d.radd_time) {
-							this.$set(this.data.auction[i],'showType',2);
+						if (time >= d.end_time && time < d.radd_time) {
+							this.$set(this.data.auction[i], 'showType', 2);
 						}
-						
+
 						//判断是否入场-判断是不是到预约时间-是否已预约
-						if(d.booking_count > 0 && time >= d.radd_time && time < d.rend_time) {
-							this.$set(this.data.auction[i],'showType',3);
+						if (d.booking_count > 0 && time >= d.radd_time && time < d.rend_time) {
+							this.$set(this.data.auction[i], 'showType', 3);
 						}
-						
-						if(d.booking_count <= 0 && time >= d.radd_time && time < d.rend_time && time > d.end_time) {
-							this.$set(this.data.auction[i],'showType',3);
+
+						if (d.booking_count <= 0 && time >= d.radd_time && time < d.rend_time && time > d.end_time) {
+							this.$set(this.data.auction[i], 'showType', 3);
 						}
-						
-						
-						if(time > d.rend_time) {
-							this.$set(this.data.auction[i],'showType',4);
+
+
+						if (time > d.rend_time) {
+							this.$set(this.data.auction[i], 'showType', 4);
 						}
-						
+
 					}
-					
+
 				}
 			}
 		}
@@ -444,94 +452,168 @@
 
 <style lang="scss">
 	@import url("/components/gaoyia-parse/parse.css");
-	.app-bg{
+
+	.app-bg {
 		position: absolute;
-		image{width: 100vw;height: 45vw;}
+
+		image {
+			width: 100vw;
+			height: 45vw;
+		}
 	}
-	.app-body{
+
+	.app-body {
 		position: relative;
 		z-index: 9;
 		padding: 0px 30rpx;
 	}
-	
+
 	//业绩通道
-	.pannel{
+	.pannel {
 		background: #fff;
 		border-radius: 20rpx;
 		margin-top: 20rpx;
 		padding: 60rpx 0;
-		.item{
+
+		.item {
 			width: calc(33% - 1px);
+
 			.label {
-			    font-size: 14px;
-			    color: #666666;
-			    margin-top: 5px;
+				font-size: 14px;
+				color: #666666;
+				margin-top: 5px;
 			}
-			.count{
-			    font-weight: bold;
-			    font-size: 21px;
-			    color: #0C1732;
+
+			.count {
+				font-weight: bold;
+				font-size: 21px;
+				color: #0C1732;
 			}
 		}
-		.line{
+
+		.line {
 			width: 1px;
 			height: 45px;
 			background: #DCDCDC;
 		}
 	}
-	
-	
+
+
 	//抢货通道
-	.team-buy{
+	.team-buy {
 		background: #F8F8FA;
-		.top{
-			.label{color:#DB292B;font-size: 30rpx;font-weight: bold;}
-			.sbtn{border: 2rpx solid #DB292B;border-radius: 10rpx;color: #DB292B;font-size: 24rpx;padding: 14rpx 16rpx;}
+
+		.top {
+			.label {
+				color: #DB292B;
+				font-size: 30rpx;
+				font-weight: bold;
+			}
+
+			.sbtn {
+				border: 2rpx solid #DB292B;
+				border-radius: 10rpx;
+				color: #DB292B;
+				font-size: 24rpx;
+				padding: 14rpx 16rpx;
+			}
 		}
-		.team-show{
+
+		.team-show {
 			width: 100%;
 			height: 260rpx;
 			border-radius: 20rpx;
 			margin-top: 20rpx;
 			position: relative;
-			.bg{
+
+			.bg {
 				width: 100%;
 				height: 260rpx;
 				position: absolute;
-				image{
+
+				image {
 					width: 100%;
 					height: 100%;
 					border-radius: 20rpx;
 				}
-				.h{background-color: rgba(0, 0, 0, 0.2);position: absolute;z-index: 9;width: 100%;height: 100%;border-radius: 20rpx;top: 0;}
+
+				.h {
+					background-color: rgba(0, 0, 0, 0.2);
+					position: absolute;
+					z-index: 9;
+					width: 100%;
+					height: 100%;
+					border-radius: 20rpx;
+					top: 0;
+				}
 			}
-			.body{
+
+			.body {
 				position: relative;
 				z-index: 10;
 				height: 100%;
-				.top-input{
+
+				.top-input {
 					position: relative;
-					.tbg{width: 250rpx;height: 70rpx;}
-					.inner{
+
+					.tbg {
+						width: 250rpx;
+						height: 70rpx;
+					}
+
+					.inner {
 						width: 100%;
 						height: 100%;
 						position: absolute;
-						top: 0;left: 0;
-						image{width: 28rpx;height: 28rpx;}
-						.label{color: #fff;font-weight: bold;font-size: 36rpx;margin-left: 6rpx;}
+						top: 0;
+						left: 0;
+
+						image {
+							width: 28rpx;
+							height: 28rpx;
+						}
+
+						.label {
+							color: #fff;
+							font-weight: bold;
+							font-size: 36rpx;
+							margin-left: 6rpx;
+						}
 					}
 				}
-				.info{
+
+				.info {
 					width: 100%;
-					.item{
+
+					.item {
 						width: calc(33% - 1px);
-						.name{color: #fff;font-size: 30rpx;margin-top: 24rpx;}
-						.label{color: #fff;width:80%;font-size: 30rpx;font-weight: bold; overflow: hidden;text-overflow:ellipsis;white-space: nowrap;text-align: center;}
-						.people{
-							image{width: 26rpx;height: 34rpx;}
+
+						.name {
+							color: #fff;
+							font-size: 30rpx;
+							margin-top: 24rpx;
+						}
+
+						.label {
+							color: #fff;
+							width: 80%;
+							font-size: 30rpx;
+							font-weight: bold;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+							text-align: center;
+						}
+
+						.people {
+							image {
+								width: 26rpx;
+								height: 34rpx;
+							}
 						}
 					}
-					.halving{
+
+					.halving {
 						width: 2rpx;
 						height: 80rpx;
 						background: #fff;
@@ -540,83 +622,176 @@
 			}
 		}
 	}
-	
-	.venue-list{
-		.item{
+
+	.venue-list {
+		.item {
 			background: #fff;
 			border-radius: 20rpx;
 			padding: 30rpx;
 			margin-top: 20rpx;
-			.top-info{
-				.avatar{
+
+			.top-info {
+				.avatar {
 					width: 100rpx;
 					height: 100rpx;
 					border-radius: 10rpx;
 					background: #f1f1f1;
-					image{
+
+					image {
 						width: 100rpx;
 						height: 100rpx;
 						border-radius: 10rpx;
 					}
 				}
-				.info{
+
+				.info {
 					width: calc(100% - 120rpx);
 					margin-left: 20rpx;
-					.title{color: #081734;font-size: 34rpx;font-weight: bold;}
-					.time{
+
+					.title {
+						color: #081734;
+						font-size: 34rpx;
+						font-weight: bold;
+					}
+
+					.time {
 						font-size: 22rpx;
 						color: #666666;
-						image{width: 30rpx;height: 28rpx;margin-right: 8rpx;}
+
+						image {
+							width: 30rpx;
+							height: 28rpx;
+							margin-right: 8rpx;
+						}
+
 						margin-top: 20rpx;
 					}
 				}
 			}
-			
-			.yinfo{
+
+			.yinfo {
 				padding: 40rpx 0;
-				.y-time{
+
+				.y-time {
 					color: #666666;
 					font-size: 26rpx;
-					text{color: #081734;}
+
+					text {
+						color: #081734;
+					}
 				}
+
 				border-bottom: 1px solid #f1f1f1;
 			}
-			
-			.yfoot{
+
+			.yfoot {
 				padding-top: 10px;
-				.time1{font-size: 14px;}
-				.sbtn{background: #d13737;color: #fff;font-size: 14px;border-radius: 20rpx;padding: 4px 10px;}
-				.sbtn-no{background: #f1f1f1;color: #787878;font-size: 14px;border-radius: 20rpx;padding: 4px 10px}
+
+				.time1 {
+					font-size: 14px;
+				}
+
+				.sbtn {
+					background: #d13737;
+					color: #fff;
+					font-size: 14px;
+					border-radius: 20rpx;
+					padding: 4px 10px;
+				}
+
+				.sbtn-no {
+					background: #f1f1f1;
+					color: #787878;
+					font-size: 14px;
+					border-radius: 20rpx;
+					padding: 4px 10px
+				}
 			}
-			
+
 		}
 	}
-	.user-bann{
-		.tips{font-size: 14px;color: #787878;}
-		.btn{background: $ic-appcolor;font-size: 14px;color: #fff;width: 160px;border-radius: 20px;height: 40px;text-align:center;line-height: 40px;}
-		
+
+	.user-bann {
+		.tips {
+			font-size: 14px;
+			color: #787878;
+		}
+
+		.btn {
+			background: $ic-appcolor;
+			font-size: 14px;
+			color: #fff;
+			width: 160px;
+			border-radius: 20px;
+			height: 40px;
+			text-align: center;
+			line-height: 40px;
+		}
+
 	}
-	
-/**弹出框 **/
-	.popwin{position:fixed;width: 100%;height: 100%;top: 0;left: 0;z-index: 88;}
-	.popwin .bg{background: rgba(0, 0, 0, 0.5);height: 100%;width: 100%;position: absolute;left: 0;top: 0;}
-	.popwin .body{padding: 20px;width: 80%;background: #fff;position: relative;border-radius: 8px;
+
+	/**弹出框 **/
+	.popwin {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		z-index: 88;
 	}
-	.max-he{height: 60vh;}
-	.popwin .btn{margin-top: 6px;border-radius: 4px;background: #dc262b;font-size:14px;color: #fff;width: 100px;text-align: center;padding: 6px 2px;}
-	.popwin .btn.no{background: #f1f1f1;color: #ccc}
-	
-	
-	.booking{
-		.booking-content{
+
+	.popwin .bg {
+		background: rgba(0, 0, 0, 0.5);
+		height: 100%;
+		width: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+	}
+
+	.popwin .body {
+		padding: 20px;
+		width: 80%;
+		background: #fff;
+		position: relative;
+		border-radius: 8px;
+	}
+
+	.max-he {
+		height: 60vh;
+	}
+
+	.popwin .btn {
+		margin-top: 6px;
+		border-radius: 4px;
+		background: #dc262b;
+		font-size: 14px;
+		color: #fff;
+		width: 100px;
+		text-align: center;
+		padding: 6px 2px;
+	}
+
+	.popwin .btn.no {
+		background: #f1f1f1;
+		color: #ccc
+	}
+
+
+	.booking {
+		.booking-content {
 			font-size: 26px;
 			padding: 10px 0;
-			text{color: #d13737;}
+
+			text {
+				color: #d13737;
+			}
 		}
-	
-		.foot{
+
+		.foot {
 			padding: 20rpx 0;
-			.btn{
+
+			.btn {
 				height: 40px;
 				background: #dc262b;
 				border-radius: 5px;
@@ -627,8 +802,8 @@
 				width: 30vw;
 				margin-right: 4vw;
 			}
-			
-			.nbtn{
+
+			.nbtn {
 				height: 40px;
 				border: 1px solid #dc262b;
 				border-radius: 5px;
@@ -641,5 +816,4 @@
 			}
 		}
 	}
-	
 </style>

+ 2 - 3
pages/index/home.vue

@@ -5,10 +5,9 @@
 				<image src="/static/img/logo.png" style="width: 25vw;height: 25vw;border-radius: 50%;"></image>
 			</view>
 		</view>
-		
 		<view class="app-foot" :class="fadeIn">
-			<view style="margin-bottom: 240px;font-size: 24px;">杭州尚视拍卖有限公司</view>	
-			<view>浙ICP备2022017146号-2</view>
+			<view style="margin-bottom: 240px;font-size: 24px;">中国长城计算机进出口公司</view>
+			<view>京ICP备2024043848号-3A</view>
 		</view>
 	</view>
 </template>

+ 10 - 4
pages/index/index.vue

@@ -73,7 +73,7 @@
 					<!--CBB潮贝抢货通道-->
 					<view class="team-buy" @tap="tapOpen" data-url="/pages/guild/itemIndex" v-if="guData!= null">
 						<view class="top fx-r fx-bc">
-							<view class="label">CBB潮贝抢货通道</view>
+							<view class="label">长城易趣抢货通道</view>
 							<view class="fx-g1"></view>
 							<!-- <view class="sbtn">更多CBB代理团队 ></view> -->
 						</view>
@@ -239,7 +239,12 @@
 						{{title}}
 					</view>
 					<scroll-view scroll-y class="max-he">
-						<u-parse :content="content" :noData="content" />
+						<u-parse :imageProp="{
+						mode: 'widthFix',
+						padding: 0,
+						lazyLoad: false,
+						domain: ''
+					}" :content="content" :noData="content" />
 					</scroll-view>
 					<view class="fx-r fx-bc fx-ac foot" style="margin-top: 60rpx;">
 						<view class="btn" @tap="tapYGdBtn">未阅读,去查看></view>
@@ -304,6 +309,7 @@
 		onLoad() {
 			this.initView();
 			// #ifdef APP
+			// console.log(233333333333333333)
 			this.isShowInit(false);
 			// #endif
 			// #ifdef APP
@@ -321,6 +327,7 @@
 			...mapMutations(['setSys', 'getGps']),
 			// #ifdef APP
 			isShowInit(type) {
+				// console.log(type,'type11111111111111')
 				uni.setTabBarItem({
 					index: 1,
 					visible: type,
@@ -387,7 +394,6 @@
 					}
 				});
 				// #endif
-
 			},
 			// #ifdef APP
 			/** 
@@ -434,7 +440,7 @@
 						id: id
 					})
 					.then(res => {
-						// console.log(res);
+						console.log(res);
 						if (res.code == 200) {
 							this.title = res.data.title;
 							this.content = res.data.content;

+ 2 - 2
pages/login/index.vue

@@ -11,7 +11,7 @@
 					<view class="logo">
 						<image src="/static/img/cbb_white.png"></image>
 					</view>
-					<view class="label-text">欢迎登录易趣CBB</view>
+					<view class="label-text">欢迎登录长城易趣</view>
 				</view>
 				
 			</view>
@@ -52,7 +52,7 @@
 					
 					
 					<text  @tap="tapOpen" data-url="/pages/operation/user">《用户协议》</text>
-					,认真阅读<text  @tap="tapOpen" data-url="/pages/operation/package">《易趣CBB产品购买协议》</text>
+					,认真阅读<text  @tap="tapOpen" data-url="/pages/operation/package">《长城易趣产品购买协议》</text>
 				</view>
 				
 			</view>

+ 2 - 2
pages/login/register.vue

@@ -11,7 +11,7 @@
 					<view class="logo">
 						<image src="/static/img/cbb_white.png"></image>
 					</view>
-					<view class="label-text">注册易趣CBB</view>
+					<view class="label-text">注册长城易趣</view>
 				</view>
 			</view>
 		</view>
@@ -61,7 +61,7 @@
 						注册及同意
 					</view>
 				<text  @tap="tapOpen" data-url="/pages/operation/user">《用户协议》</text>
-				,认真阅读<text  @tap="tapOpen" data-url="/pages/operation/package">《易趣CBB产品购买协议》</text>
+				,认真阅读<text  @tap="tapOpen" data-url="/pages/operation/package">《长城易趣产品购买协议》</text>
 				</view>
 				<view id="captcha"></view>
 			</view>

BIN
static/img/cbb_white.png


BIN
static/img/index-logo.png


BIN
static/img/logo.png


+ 2 - 2
unpackage/dist/build/web/index.html

@@ -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)'))
-            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.1cd6744a.js></script><script src=/h5/static/js/index.8bd944b2.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>长城易趣</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.2378ece3.js></script><script src=/h5/static/js/index.7a1d233e.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
 	var noddy, remotes = false;
 	document.addEventListener('click', function(event) {
 		noddy = event.target;

BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/2e1385d2202aac2e7f5f14d70cf3b9a.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/71c34d68cb11c4070a4c84090f233d8.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


BIN
unpackage/证书/安卓/cbb.keystore


BIN
unpackage/证书/安卓/ccyq.keystore


+ 1 - 1
unpackage/证书/安卓/newyqg.txt

@@ -1,4 +1,4 @@
-别名:com.cbb.cn
+别名:com.app.ccyq
 密码:112233
 
 测试包名:com.cbbtest.inc