yuxingxing 2 年之前
父节点
当前提交
81b2e2f59d

+ 0 - 243
components/couponWindow/index.vue

@@ -1,243 +0,0 @@
-<template>
-	<view :style="colorStyle">
-		<view class='coupon-window' :class='window==true?"on":""'>
-			<image class="co-bag" :src="imgHost + '/statics/images/co-bag.png'" mode=""></image>
-			<view class='couponWinList'>
-				<view class='item acea-row row-between-wrapper' v-for="(item,index) in couponList" :key="index">
-					<view class='money font-color'>{{$t(`¥`)}}<text class='num'>{{item.coupon_price}}</text></view>
-					<view class='text'>
-						<view class='name'>{{$t(`购物满`)}}{{item.use_min_price}}{{$t(`减`)}}{{item.coupon_price}}</view>
-						<view v-if="item.coupon_time">{{$t(`领取后`)}}{{item.coupon_time}}{{$t(`天内可用`)}}</view>
-						<view v-else>
-							{{item.start_time ? item.start_time+'-' : ''}}{{item.end_time === 0 ? $t(`不限时`) : item.end_time}}
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class='lid'>
-				<navigator hover-class='none' url='/pages/users/user_get_coupon/index' class='bnt'>{{$t(`立即领取`)}}</navigator>
-				<view class='iconfont icon-guanbi3' @click="close"></view>
-			</view>
-		</view>
-		<view class='mask' catchtouchmove="true" :hidden="window==false"></view>
-	</view>
-</template>
-
-<script>
-	import colors from "@/mixins/color";
-	import {HTTP_REQUEST_URL} from '@/config/app';
-	export default {
-		props: {
-			window: {
-				type: Boolean | String | Number,
-				default: false,
-			},
-			couponList: {
-				type: Array,
-				default: function() {
-					return []
-				},
-			},
-			couponImage: {
-				type: String,
-				default: '',
-			},
-		},
-		mixins: [colors],
-		data() {
-			return {
-				imgHost:HTTP_REQUEST_URL
-			};
-		},
-		methods: {
-			close: function() {
-				this.$emit('onColse');
-			}
-		}
-	}
-</script>
-
-
-<style scoped lang="scss">
-	.mask {
-		z-index: 9999;
-	}
-
-	.coupon-window {
-		width: 572rpx;
-		height: 760rpx;
-		position: fixed;
-		top: 20%;
-		z-index: 10000;
-		left: 50%;
-		margin-left: -286rpx;
-		transform: translate3d(0, -200%, 0);
-		transition: all .3s cubic-bezier(.25, .5, .5, .9);
-		border-radius: 30rpx 30rpx 0 0;
-		overflow-x: hidden;
-	}
-
-	.co-bag {
-		width: 100%;
-		height: 250rpx;
-		z-index: 33333;
-		top: -40rpx;
-		position: absolute;
-	}
-
-	.coupon-window:after {
-		width: 900rpx;
-		height: 650rpx;
-		position: absolute;
-		top: 0%;
-		left: 50%;
-		z-index: 11111;
-		margin-left: -450rpx;
-		content: '';
-		border-radius: 50% 50% 0 0;
-		background: var(--view-theme);
-	}
-
-	.coupon-window.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.coupon-window .couponWinList {
-		width: 480rpx;
-		margin: 157rpx 0 0 50rpx;
-		height: 340rpx;
-		overflow-y: scroll;
-	}
-
-	.coupon-window .couponWinList .item {
-		width: 100%;
-		height: 120rpx;
-		background-color: #fff;
-		position: relative;
-		margin-bottom: 17rpx;
-		position: relative;
-		z-index: 99999;
-	}
-
-	.coupon-window .couponWinList .item .left {
-		border-right: 1px dashed #ccc;
-	}
-
-	.coupon-window .couponWinList .label {
-		width: 28rpx;
-		height: 64rpx;
-		display: block;
-		position: absolute;
-		top: 0;
-		right: 12rpx;
-	}
-
-	.coupon-window .couponWinList .item::after {
-		content: '';
-		position: absolute;
-		width: 18rpx;
-		height: 18rpx;
-		border-radius: 50%;
-		background-color: var(--view-theme);
-		left: 25.5%;
-		bottom: 0;
-		margin-bottom: -9rpx;
-	}
-
-	.coupon-window .couponWinList .item::before {
-		content: '';
-		position: absolute;
-		width: 18rpx;
-		height: 18rpx;
-		border-radius: 50%;
-		background-color: var(--view-theme);
-		left: 25.5%;
-		top: 0;
-		margin-top: -9rpx;
-	}
-
-	.coupon-window .couponWinList .item .money {
-		width: 130rpx;
-		text-align: center;
-		font-size: 26rpx;
-		font-weight: bold;
-	}
-
-	.coupon-window .couponWinList .item .min_money {
-		color: #ccc;
-		font-size: 18rpx;
-		text-align: center;
-	}
-
-	.coupon-window .couponWinList .item .money .num {
-		font-size: 40rpx;
-	}
-
-	.coupon-window .couponWinList .item .text {
-		width: 349rpx;
-		font-size: 22rpx;
-		color: #ccc;
-		padding: 0 29rpx;
-		box-sizing: border-box;
-	}
-
-	.coupon-window .couponWinList .item .text .image {
-		width: 32rpx;
-		height: 32rpx;
-		display: inline-block;
-		vertical-align: bottom;
-		margin-right: 10rpx;
-	}
-
-	.coupon-window .couponWinList .item .text .name {
-		font-size: 26rpx;
-		color: var(--view-priceColor);
-		font-weight: bold;
-		margin-bottom: 9rpx;
-		width: 250rpx;
-	}
-
-	.coupon-window .lid {
-		background: rgba(255, 255, 255, 0.2);
-		width: 582rpx;
-		height: 224rpx;
-		position: fixed;
-		z-index: 22222;
-		left: 50%;
-		top: 0%;
-		margin: 424rpx 0 0 -296rpx;
-	}
-
-	.coupon-window .lid:after {
-		width: 920rpx;
-		height: 280rpx;
-		position: absolute;
-		top: -100%;
-		left: 50%;
-		z-index: 22222;
-		margin-left: -460rpx;
-		content: '';
-		border-radius: 0 0 50% 50%;
-		background: var(--view-theme);
-	}
-
-	.coupon-window .lid .bnt {
-		font-size: 29rpx;
-		width: 440rpx;
-		height: 80rpx;
-		border-radius: 40rpx;
-		background: linear-gradient(90deg, #FFCA52 0%, #FE960F 100%);
-		text-align: center;
-		line-height: 80rpx;
-		font-weight: bold;
-		margin: 98rpx auto 0 auto;
-		color: #fff;
-	}
-
-	.coupon-window .lid .iconfont {
-		color: #fff;
-		font-size: 60rpx;
-		text-align: center;
-		margin-top: 87rpx;
-	}
-</style>

+ 0 - 301
components/menuIcon.vue

@@ -1,301 +0,0 @@
-<template>
-	<view>
-		<view id="home" class="home acea-row row-center-wrapper"
-			:class="[returnShow ? 'p10':'p20', text_opacity >= 1 ? 'opacity':'']" :style="{ marginTop: menuButton.top +'px', width: menuButton.width + 'px'}">
-			<view v-if="returnShow" class="iconfont icon-xiangzuo" :class="text_opacity >= 1 ? 'opacity':''"
-				@tap="returns">
-			</view>
-
-			<view class="line" v-if="returnShow"></view>
-			<view class="animation-box">
-				<transition name="fade">
-					<view v-if="!Active" class="iconfont icon-gengduo4" :class="text_opacity >= 1 ? 'opacity':''"
-						@click="open">
-					</view>
-					<!-- 	<view v-if="Active" class="iconfont icon-guanbi5" @click="open">
-					</view> -->
-				</transition>
-				<transition name="fade" mode="out-in">
-					<!-- 	<view v-if="!Active" class="iconfont icon-gengduo4" @click="open">
-					</view> -->
-					<view v-if="Active" class="iconfont icon-guanbi5" :class="text_opacity >= 1 ? 'opacity':''"
-						@click="open">
-					</view>
-				</transition>
-			</view>
-			<view class="homeCon bg-color" :class="Active === true ? 'active' : ''" v-if="Active" @click="open">
-				<view class="homeCon-box" v-for="(item,index) in iconList" :key="index"
-					@click="jumpUrl(item.path,item.jumpType)">
-					<text class='iconfont' :class="item.iconName">
-					</text>
-					<text class="text">{{item.name}}</text>
-				</view>
-
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "menuIcon",
-		data() {
-			return {
-				Active: false,
-				returnShow: true, //判断顶部返回是否出现
-				homeTop: 20,
-				text_opacity: 0,
-				menuButton:{},
-				iconList: [{
-						name: this.$t(`首页`),
-						iconName: "icon-shouye8",
-						path: '/pages/index/index',
-						jumpType: 1
-					},
-					{
-						name: this.$t(`购物车`),
-						iconName: "icon-gouwuche7",
-						path: '/pages/order_addcart/order_addcart',
-						jumpType: 1
-					},
-					{
-						name: this.$t(`搜索`),
-						iconName: "icon-sousuo6",
-						path: '/pages/goods/goods_search/index',
-						jumpType: 0
-					},
-					{
-						name: this.$t(`我的收藏`),
-						iconName: "icon-shoucang3",
-						path: '/pages/users/user_goods_collection/index',
-						jumpType: 0
-					},
-					{
-						name: this.$t(`个人中心`),
-						iconName: "icon-yonghu1",
-						path: '/pages/user/index',
-						jumpType: 1
-					}
-				]
-			};
-		},
-		props: {
-			showMenuIcon: {
-				type: Boolean,
-				default: false
-			},
-			opacity: {
-				type: Number,
-				default: 1
-			}
-		},
-		watch: {
-			showMenuIcon(e) {
-				this.Active = e
-			},
-			opacity(e) {
-				this.text_opacity = e
-			}
-		},
-		mounted() {
-			var pages = getCurrentPages();
-			this.returnShow = pages.length === 1 ? false : true;
-			this.$nextTick(() => {
-				// #ifdef MP
-				this.menuButton = uni.getMenuButtonBoundingClientRect();
-				const query = uni.createSelectorQuery().in(this);
-				console.log(this.menuButton)
-				query
-					.select('#home')
-					.boundingClientRect(data => {
-						this.homeTop = this.menuButton.top * 2 + this.menuButton.height - data.height + 2;
-					})
-					.exec();
-				// #endif
-			});
-		},
-		methods: {
-			open() {
-				this.Active = !this.Active
-				if (this.Active) this.$emit('open', true)
-			},
-			// 后退
-			returns() {
-				uni.navigateBack();
-			},
-			jumpUrl(url, type) {
-				(type === 1 ? uni.switchTab : uni.navigateTo)({url})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.home {
-		/* #ifdef H5 */
-		top: 20rpx !important;
-		/* #endif */
-	}
-
-	.home.opacity {
-		background: rgba(255, 255, 255, 1);
-		border: 1px solid #d7d7d7;
-	}
-
-	.home {
-		color: #333;
-		position: fixed;
-		// width: 130rpx;
-		// padding: 0 20rpx;
-		height: 62rpx;
-		z-index: 99;
-		left: 33rpx;
-		border: 1px solid #d7d7d7;
-		background: rgba(255, 255, 255, 0.8);
-		border-radius: 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		.opacity {
-			color: #000;
-		}
-
-		.icon-gengduo4,
-		.icon-guanbi5 {
-			position: absolute;
-			width: 40rpx;
-			font-weight: bold;
-		}
-			
-		.icon-xiangzuo{
-			font-weight: bold;
-			line-height: 28rpx;
-		}
-		.icon-gengduo4 {
-			font-size: 28rpx;
-			text-align: center;
-		}
-	}
-
-	.home .animation-box {
-		position: relative;
-		width: 40rpx;
-		height: 28rpx;
-	}
-
-	.icon-guanbi5 {
-		font-size: 28rpx;
-		text-align: center;
-	}
-
-	.home .homeCon {
-		display: flex;
-		flex-direction: column;
-		font-size: 26rpx;
-		padding: 4rpx;
-		opacity: 0;
-		border: 1px solid #f2f2f2;
-
-		&::before {
-			content: "";
-			width: 0;
-			height: 0;
-			border-left: 15rpx solid transparent;
-			border-right: 15rpx solid transparent;
-			border-bottom: 17rpx solid #fff;
-			position: absolute;
-			top: -15rpx;
-			right: 66rpx;
-			border-bottom-color: #f2f2f2;
-		}
-
-		&::after {
-			content: "";
-			width: 0;
-			height: 0;
-			border-left: 15rpx solid transparent;
-			border-right: 15rpx solid transparent;
-			border-bottom: 17rpx solid #fff;
-			position: absolute;
-			top: -13rpx;
-			right: 66rpx;
-		}
-
-		.homeCon-box {
-			display: flex;
-			align-items: center;
-			flex-wrap: nowrap;
-			width: 100%;
-			padding: 15rpx 20rpx;
-
-			.text {
-				display: flex;
-				flex-wrap: nowrap;
-			}
-		}
-
-		.iconfont {
-			display: flex;
-			align-items: center;
-			padding: 5rpx 3rpx;
-			margin-right: 5rpx;
-		}
-
-		.homeCon-box:nth-child(even) {
-			border-top: 1px solid #f2f2f2;
-			border-bottom: 1px solid #f2f2f2;
-		}
-	}
-
-	.home .homeCon.active {
-		position: absolute;
-		opacity: 1;
-		top: 75rpx;
-		animation: bounceInLeft 0.5s cubic-bezier(0.215, 0.310, 0.655, 1.000);
-		width: max-content;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 10rpx;
-		color: #333;
-		background: #fff !important;
-		box-shadow: $uni-index-box-shadow;
-	}
-
-	.home .line {
-		width: 2rpx;
-		height: 26rpx;
-		margin: 0 18rpx 0 16rpx;
-		background: rgba(255, 255, 255, 1);
-	}
-
-	.home .line.opacity {
-		color: #050505;
-		background-color: #050505;
-	}
-
-	.home .icon-xiangzuo {
-		font-size: 28rpx;
-	}
-
-	.fade-enter-active,
-	.fade-leave-active {
-		transition: opacity .3s;
-	}
-
-	.fade-enter,
-	.fade-leave-to
-
-	/* .fade-leave-active below version 2.1.8 */
-		{
-		opacity: 0;
-	}
-
-	.p10 {
-		padding: 0 25rpx;
-	}
-
-	.p20 {
-		padding: 0 40rpx;
-	}
-</style>

+ 0 - 430
components/update/app-update.vue

@@ -1,430 +0,0 @@
-<template>
-	<view class="wrap" v-if="popup_show">
-		<view class="popup-bg" :style="getHeight">
-			<view class="popup-content" :class="{ 'popup-content-show': popup_show }">
-				<view class="update-wrap">
-					<image src="./images/img.png" class="top-img"></image>
-					<view class="content">
-						<text class="title">{{ $t(`发现新版本`) }}{{ update_info.version }}</text>
-						<!-- 升级描述 -->
-						<view class="title-sub" v-html="update_info.info"></view>
-						<!-- 升级按钮 -->
-						<button class="btn" v-if="downstatus < 1" @click="nowUpdate()">
-							{{ $t(`立即升级`) }}
-						</button>
-						<!-- 下载进度 -->
-						<view class="sche-wrap" v-else>
-							<!-- 更新包下载中 -->
-							<view class="sche-bg">
-								<view class="sche-bg-jindu" :style="lengthWidth"></view>
-							</view>
-							<text class="down-text">{{ $t(`下载进度`) }}:{{ (downSize / 1024 / 1024).toFixed(2) }}M/{{
-									(fileSize / 1024 / 1024).toFixed(2)
-							}}M</text>
-						</view>
-					</view>
-				</view>
-				<image src="./images/close.png" class="close-ioc" @click="closeUpdate()"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-let vm;
-import {
-	getUpdateInfo
-} from '@/api/public.js'
-
-export default {
-	name: "appUpdate",
-	//@是否强制更新
-	props: {
-		tabbar: {
-			type: Boolean,
-			default: false, //是否有原生tabbar组件
-		},
-		getVer: {
-			type: Boolean,
-			default: false, //是否有原生tabbar组件
-		},
-	},
-	data() {
-		return {
-			popup_show: false, //弹窗是否显示
-			platform: "", //ios or android
-			version: "1.0.0", //当前软件版本
-			need_update: false, // 是否更新
-			downing: false, //是否下载中
-			downstatus: 0, //0未下载  1已开始 2已连接到资源  3已接收到数据  4下载完成
-			update_info: {
-				os: "", //设备系统
-				version: "", //最新版本
-				info: "", //升级说明
-			},
-			fileSize: 0, //文件大小
-			downSize: 0, //已下载大小
-			viewObj: null, //原生遮罩view
-		};
-	},
-	created() {
-		vm = this;
-		if (!this.getVer) this.update()
-	},
-	computed: {
-		// 下载进度计算
-		lengthWidth: function () {
-			let w = (this.downSize / this.fileSize) * 100;
-			if (!w) {
-				w = 0;
-			} else {
-				w = w.toFixed(2);
-			}
-			return {
-				width: w + "%", //return 宽度半分比
-			};
-		},
-		getHeight() {
-			let bottom = 0;
-			if (this.tabbar) {
-				bottom = 50;
-			}
-			return {
-				bottom: bottom + "px",
-				height: "auto",
-			};
-		},
-	},
-	methods: {
-		// 检查更新
-		update() {
-			// #ifdef APP-PLUS
-			// 获取手机系统信息
-			uni.getSystemInfo({
-				success: function (res) {
-					vm.platform = res.platform; //ios  or android
-					console.log("手机系统信息", vm.platform);
-				},
-			});
-
-			// 获取版本号
-			plus.runtime.getProperty(plus.runtime.appid, function (inf) {
-				vm.version = inf.version;
-			});
-			console.log("当前版本", vm.version);
-			this.getUpdateInfo(); //获取更新信息
-			// #endif
-		},
-
-		// 获取线上版本信息
-		getUpdateInfo() {
-			//向后台发起请求,获取最新版本号
-			getUpdateInfo(this.platform === "ios" ? 2 : 1)
-				.then((res) => {
-					console.log(res)
-					if (Array.isArray(res.data)) {
-						return this.$emit('isNew')
-					}
-					const tagDate = uni.getStorageSync('app_update_time') || '',
-						nowDate = new Date().toLocaleDateString();
-					if (tagDate !== nowDate && !this.getVer) {
-						uni.setStorageSync('app_update_time', new Date().toLocaleDateString());
-					} else if ((tagDate !== nowDate) && this.getVer) {
-						if (!res.data.is_force) return
-					} else if (tagDate == nowDate && !this.getVer && !res.data.is_force) {
-						return
-					}
-					// 这里的返回的数据跟后台约定
-					let data = res.data;
-					// 循环获取当前设备对应的更新数据
-					vm.update_info = data;
-					if (!vm.update_info.platform) {
-						// 后台未配置当前系统的升级数据
-					} else {
-						console.log('111111111111111')
-						vm.checkUpdate(); ///检查是否更新
-					}
-				})
-				.catch((err) => {
-					vm.popup_show = false
-					console.log(err);
-				});
-		},
-		// 检查是否更新
-		checkUpdate() {
-			vm.need_update = vm.compareVersion(vm.version, vm.update_info.version); // 检查是否需要升级
-			if (vm.need_update) {
-				vm.popup_show = true; //线上版本号大于当前安装的版本号  显示升级框
-				if (vm.tabbar) {
-					//页面是否有原生tabbar组件
-					// 创建原生view用来遮罩tabbar的点击事件 (如果是没有用原生的tabbar这一步可以取消)
-					vm.viewObj = new plus.nativeObj.View("viewObj", {
-						bottom: "0px",
-						left: "0px",
-						height: "50px",
-						width: "100%",
-						backgroundColor: "rgba(0,0,0,.6)",
-					});
-					vm.viewObj.show(); //显示原生遮罩
-				}
-			} else {
-				this.$emit('isNew')
-			}
-		},
-
-		// 取消更新
-		closeUpdate() {
-			if (vm.update_info.is_force) {
-				// 强制更新,取消退出app
-				this.platform == "android" ?
-					plus.runtime.quit() :
-					plus.ios
-						.import("UIApplication")
-						.sharedApplication()
-						.performSelector("exit");
-			} else {
-				vm.popup_show = false; //关闭升级弹窗
-				if (vm.viewObj) vm.viewObj.hide(); //隐藏原生遮罩
-			}
-		},
-		// 立即更新
-		nowUpdate() {
-			if (vm.downing) return false; //如果正在下载就停止操作
-			vm.downing = true; //状态改变 正在下载中
-
-			if (/\.apk$/.test(vm.update_info.url)) {
-				// 如果是apk地址
-				vm.download_wgt(); // 安装包/升级包更新
-			} else if (/\.wgt$/.test(vm.update_info.url)) {
-				// 如果是更新包
-				vm.download_wgt(); // 安装包/升级包更新
-			} else {
-				plus.runtime.openURL(vm.update_info.url, function () {
-					//调用外部浏览器打开更新地址
-					plus.nativeUI.toast("打开错误");
-				});
-			}
-		},
-		// 下载升级资源包
-		download_wgt() {
-			plus.nativeUI.showWaiting("下载更新文件..."); //下载更新文件...
-			let options = {
-				method: "get",
-			};
-			let dtask = plus.downloader.createDownload(
-				vm.update_info.url,
-				options,
-				function (d, status) { }
-			);
-
-			dtask.addEventListener("statechanged", function (task, status) {
-				if (status === null) { } else if (status == 200) {
-					//在这里打印会不停的执行,请注意,正式上线切记不要在这里打印东西///////////////////////////////////////////////////
-					vm.downstatus = task.state;
-					switch (task.state) {
-						case 3: // 已接收到数据
-							vm.downSize = task.downloadedSize;
-							if (task.totalSize) {
-								vm.fileSize = task.totalSize; //服务器须返回正确的content-length才会有长度
-							}
-							break;
-						case 4:
-							vm.installWgt(task.filename); // 安装wgt包
-							break;
-					}
-				} else {
-					plus.nativeUI.closeWaiting();
-					plus.nativeUI.toast("下载出错");
-					vm.downing = false;
-					vm.downstatus = 0;
-				}
-			});
-			dtask.start();
-		},
-
-		// 安装文件
-		installWgt(path) {
-			plus.nativeUI.showWaiting("安装更新文件..."); //安装更新文件...
-			plus.runtime.install(
-				path, {},
-				function () {
-					plus.nativeUI.closeWaiting();
-					// 应用资源下载完成!
-					plus.nativeUI.alert("应用资源下载完成!", function () {
-						plus.runtime.restart();
-					});
-				},
-
-				function (e) {
-					plus.nativeUI.closeWaiting();
-					// 安装更新文件失败
-					plus.nativeUI.alert("安装更新文件失败[" + e.code + "]:" + e.message);
-				}
-			);
-		},
-		// 对比版本号
-		compareVersion(ov, nv) {
-			if (!ov || !nv || ov == "" || nv == "") {
-				return false;
-			}
-			let b = false,
-				ova = ov.split(".", 4),
-				nva = nv.split(".", 4);
-			for (let i = 0; i < ova.length && i < nva.length; i++) {
-				let so = ova[i],
-					no = parseInt(so),
-					sn = nva[i],
-					nn = parseInt(sn);
-				if (nn > no || sn.length > so.length) {
-					return true;
-				} else if (nn < no) {
-					return false;
-				}
-			}
-			if (nva.length > ova.length && 0 == nv.indexOf(ov)) {
-				return true;
-			} else {
-				return false;
-			}
-		},
-	},
-};
-</script>
-
-<style lang="scss" scoped>
-.popup-bg {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	position: fixed;
-	top: 0;
-	left: 0rpx;
-	right: 0;
-	bottom: 0;
-	width: 750rpx;
-	background-color: rgba(0, 0, 0, 0.6);
-	z-index: 10000;
-}
-
-.popup-content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-
-.popup-content-show {
-	animation: mymove 500ms;
-	transform: scale(1);
-}
-
-@keyframes mymove {
-	0% {
-		transform: scale(0);
-		/*开始为原始大小*/
-	}
-
-	100% {
-		transform: scale(1);
-	}
-}
-
-.update-wrap {
-	width: 580rpx;
-	border-radius: 18rpx;
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	background-color: #ffffff;
-	padding: 170rpx 30rpx 0;
-
-	.top-img {
-		position: absolute;
-		left: 0;
-		width: 100%;
-		height: 256rpx;
-		top: -128rpx;
-	}
-
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding-bottom: 40rpx;
-
-		.title {
-			font-size: 32rpx;
-			font-weight: bold;
-			color: #6526f3;
-		}
-
-		.title-sub {
-			text-align: center;
-			font-size: 24rpx;
-			color: #666666;
-			padding: 30rpx 0;
-		}
-
-		.btn {
-			width: 460rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #ffffff;
-			font-size: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: 100px;
-			background-color: #6526f3;
-			margin-top: 20rpx;
-		}
-	}
-}
-
-.close-ioc {
-	width: 70rpx;
-	height: 70rpx;
-	margin-top: 30rpx;
-}
-
-.sche-wrap {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: flex-end;
-	padding: 10rpx 50rpx 0;
-
-	.sche-wrap-text {
-		font-size: 24rpx;
-		color: #666;
-		margin-bottom: 20rpx;
-	}
-
-	.sche-bg {
-		position: relative;
-		background-color: #cccccc;
-		height: 30rpx;
-		border-radius: 100px;
-		width: 480rpx;
-		display: flex;
-		align-items: center;
-
-		.sche-bg-jindu {
-			position: absolute;
-			left: 0;
-			top: 0;
-			height: 30rpx;
-			min-width: 40rpx;
-			border-radius: 100px;
-			background: url(images/round.png) #5775e7 center right 4rpx no-repeat;
-			background-size: 26rpx 26rpx;
-		}
-	}
-
-	.down-text {
-		font-size: 24rpx;
-		color: #5674e5;
-		margin-top: 16rpx;
-	}
-}
-</style>

二进制
components/update/images/close.png


二进制
components/update/images/img.png


二进制
components/update/images/round.png


二进制
components/update/images/update-img.png


+ 2 - 2
config/app.js

@@ -2,8 +2,8 @@ module.exports = {
 	// 小程序配置
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式: https://您的域名
 	// 请求域名 格式: https://您的域名
-	HTTP_REQUEST_URL: `https://www.gzzhsckj.com`,
-	// HTTP_REQUEST_URL: `http://wine.gzzzyd.com`,
+	// HTTP_REQUEST_URL: `https://www.gzzhsckj.com`,
+	HTTP_REQUEST_URL: `http://wine.gzzzyd.com`,
 	// HTTP_REQUEST_URL: `v4.crmeb.net`,
 	// HTTP_REQUEST_URL: `v4.crmeb.net`,
 	// #endif
 	// #endif
 	
 	

+ 0 - 2
pages/annex/special/index.vue

@@ -66,7 +66,6 @@
 
 
 <script>
 <script>
 	const app = getApp();
 	const app = getApp();
-	import couponWindow from '@/components/couponWindow/index'
 	import {
 	import {
 		getCouponV2,
 		getCouponV2,
 		getCouponNewUser
 		getCouponNewUser
@@ -131,7 +130,6 @@
 		computed: mapGetters(['isLogin', 'uid']),
 		computed: mapGetters(['isLogin', 'uid']),
 		components: {
 		components: {
 			pageFooter,
 			pageFooter,
-			couponWindow,
 			// #ifdef H5
 			// #ifdef H5
 			...mConfig,
 			...mConfig,
 			// #endif
 			// #endif

+ 1 - 1
pages/goods/lottery/grids/index.vue

@@ -437,7 +437,7 @@
 				justify-content: center;
 				justify-content: center;
 				width: 100%;
 				width: 100%;
 				height: 100%;
 				height: 100%;
-				background-image: url('~@/static/images/code-bg.png');
+				// background-image: url('~@/static/images/code-bg.png');
 				background-size: 100% 100%;
 				background-size: 100% 100%;
 			}
 			}
 
 

+ 0 - 2
pages/goods_details/index.vue

@@ -359,7 +359,6 @@ import productWindow from "@/components/productWindow";
 import userEvaluation from "@/components/userEvaluation";
 import userEvaluation from "@/components/userEvaluation";
 // import shareRedPackets from "@/components/shareRedPackets";
 // import shareRedPackets from "@/components/shareRedPackets";
 import kefuIcon from "@/components/kefuIcon";
 import kefuIcon from "@/components/kefuIcon";
-import menuIcon from "@/components/menuIcon.vue";
 import {
 import {
 	silenceBindingSpread,
 	silenceBindingSpread,
 	updateURLParameter
 	updateURLParameter
@@ -389,7 +388,6 @@ export default {
 		userEvaluation,
 		userEvaluation,
 		// shareRedPackets,
 		// shareRedPackets,
 		kefuIcon,
 		kefuIcon,
-		menuIcon,
 		cusPreviewImg,
 		cusPreviewImg,
 		// #ifdef MP
 		// #ifdef MP
 		authorize,
 		authorize,

+ 0 - 134
pages/index/diy/components/follow.vue

@@ -1,134 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<!-- #ifdef H5 -->
-		<view class="follow acea-row row-between-wrapper" :style="'background:' + bgColor + ';margin-top:' + mbConfig + 'rpx;'" v-if='subscribe === false'>
-			<view class="picTxt acea-row row-middle">
-				<view class="pictrue"><image :src="imgConfig"></image></view>
-				<view class="name line1">{{ titleConfig }}</view>
-			</view>
-			<view class="notes acea-row row-center-wrapper" :style="'color:' + themeColor + ';border-color:' + themeColor + ';'" @click="followTap">{{$t(`关注`)}}</view>
-		</view>
-		<view class="followCode" v-if="followCode">
-			<view class="pictrue">
-				<view class="code-bg"><img class="imgs" :src="followUrl" /></view>
-			</view>
-			<view class="mask" @click="closeFollowCode"></view>
-		</view>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-// #ifdef H5
-import {
-	follow
-} from '@/api/api.js';
-import {
-	getSubscribe
-} from '@/api/public';
-export default {
-	name: 'follow',
-	props: {
-		dataConfig: {
-			type: Object,
-			default: () => {}
-		},
-		isSortType:{
-			type: String | Number,
-			default:0
-		}
-	},
-	data() {
-		return {
-			followCode: false,
-			followUrl:this.dataConfig.codeConfig?this.dataConfig.codeConfig.url : '',
-			bgColor:this.dataConfig.bgColor.color[0].item,
-			imgConfig:this.dataConfig.imgConfig.url,
-			mbConfig:this.dataConfig.mbConfig.val,
-			themeColor:this.dataConfig.themeColor.color[0].item,
-			titleConfig:this.dataConfig.titleConfig.value,
-			subscribe:false
-		};
-	},
-	created() {},
-	mounted() {
-		getSubscribe().then(res => {
-			this.subscribe = res.data.subscribe || false;
-		}).catch(() => {})
-	},
-	methods: {
-		followTap(){
-			this.followCode = true;
-			// this.getFollow();
-		},
-		closeFollowCode(){
-			this.followCode = false
-		},
-	}
-}
-// #endif
-</script>
-
-<style lang="scss">
-.follow {
-	padding: 0 20rpx;
-	height: 140rpx;
-	background: rgba(0, 0, 0, 0.02);
-	.picTxt {
-		.pictrue {
-			width: 92rpx;
-			height: 92rpx;
-			border-radius: 50%;
-			image {
-				width: 100%;
-				height: 100%;
-				border-radius: 50%;
-			}
-		}
-		.name {
-			font-size: 32rpx;
-			color: #000;
-			margin-left: 32rpx;
-			width: 400rpx;
-		}
-	}
-	.notes {
-		font-size: 28rpx;
-		color: #02a0e8;
-		width: 120rpx;
-		height: 52rpx;
-		border: 2rpx solid rgba(2, 160, 232, 1);
-		opacity: 1;
-		border-radius: 6rpx;
-	}
-}
-.followCode {
-	.pictrue {
-		width: 500rpx;
-		height: 530rpx;
-		border-radius: 12px;
-		left: 50%;
-		top: 50%;
-		margin-left: -250rpx;
-		margin-top: -360rpx;
-		position: fixed;
-		z-index: 10000;
-		.code-bg {
-			display: flex;
-			justify-content: center;
-			width: 100%;
-			height: 100%;
-			background-image: url('~@/static/images/code-bg.png');
-			background-size: 100% 100%;
-		}
-		.imgs {
-			width: 310rpx;
-			height: 310rpx;
-			margin-top: 92rpx;
-		}
-	}
-	.mask {
-		z-index: 9999;
-	}
-}
-</style>

+ 1 - 5
pages/users/user_info/index.vue

@@ -143,13 +143,10 @@
 				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">{{$t(`退出登录`)}}</view>
 				<view class="logOut cartcolor acea-row row-center-wrapper" @click="outLogin">{{$t(`退出登录`)}}</view>
 				<!-- #endif -->
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
 				<!-- #ifdef APP-PLUS -->
-				<app-update ref="appUpdate" :force="true" :tabbar="false" :getVer='true' @isNew="isNew"></app-update>
+				<!-- <app-update ref="appUpdate" :force="true" :tabbar="false" :getVer='true' @isNew="isNew"></app-update> -->
 				<!-- #endif -->
 				<!-- #endif -->
 			</view>
 			</view>
 		</form>
 		</form>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
 		<canvas canvas-id="canvas" v-if="canvasStatus"
 		<canvas canvas-id="canvas" v-if="canvasStatus"
 			:style="{width: canvasWidth + 'px', height: canvasHeight + 'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
 			:style="{width: canvasWidth + 'px', height: canvasHeight + 'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
 
 
@@ -176,7 +173,6 @@
 	import authorize from '@/components/Authorize';
 	import authorize from '@/components/Authorize';
 	// #endif
 	// #endif
 	import colors from '@/mixins/color.js';
 	import colors from '@/mixins/color.js';
-	import appUpdate from "@/components/update/app-update.vue";
 	export default {
 	export default {
 		components: {
 		components: {
 			// #ifdef APP-PLUS
 			// #ifdef APP-PLUS

二进制
static/images/code-bg.png