...

components/countDown/index.vue

@@ -1,128 +0,0 @@
-<template>
-	<view class="time" :style="justifyLeft">
-		<text class="red" v-if="tipText">{{ tipText }}</text>
-		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'" v-if="isDay === true">{{ day }}</text>
-		<text class="timeTxt red" v-if="dayText">{{ dayText }}</text>
-		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ hour }}</text>
-		<text class="timeTxt red" v-if="hourText">{{ hourText }}</text>
-		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ minute }}</text>
-		<text class="timeTxt red" v-if="minuteText">{{ minuteText }}</text>
-		<text class="styleAll" :style="'background-color:'+ bgColor +';color:'+ colors +';'">{{ second }}</text>
-		<text class="timeTxt red" v-if="secondText">{{ secondText }}</text>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "countDown",
-		props: {
-			justifyLeft: {
-				type: String,
-				default: ""
-			},
-			//距离开始提示文字
-			tipText: {
-				type: String,
-				default: "倒计时"
-			},
-			dayText: {
-				type: String,
-				default: "天"
-			},
-			hourText: {
-				type: String,
-				default: "时"
-			},
-			minuteText: {
-				type: String,
-				default: "分"
-			},
-			secondText: {
-				type: String,
-				default: "秒"
-			},
-			datatime: {
-				type: Number,
-				default: 0
-			},
-			isDay: {
-				type: Boolean,
-				default: true
-			},
-			bgColor:{
-				type: String,
-				default: ""
-			},
-			colors:{
-				type: String,
-				default: ""
-			}
-		},
-		data: function() {
-			return {
-				day: "00",
-				hour: "00",
-				minute: "00",
-				second: "00"
-			};
-		},
-		created: function() {
-			this.show_time();
-		},
-		mounted: function() {},
-		methods: {
-			show_time: function() {
-				let that = this;
-
-				function runTime() {
-					//时间函数
-					let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
-					let day = 0,
-						hour = 0,
-						minute = 0,
-						second = 0;
-					if (intDiff > 0) {
-						//转换时间
-						if (that.isDay === true) {
-							day = Math.floor(intDiff / (60 * 60 * 24));
-						} else {
-							day = 0;
-						}
-						hour = Math.floor(intDiff / (60 * 60)) - day * 24;
-						minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
-						second =
-							Math.floor(intDiff) -
-							day * 24 * 60 * 60 -
-							hour * 60 * 60 -
-							minute * 60;
-						if (hour <= 9) hour = "0" + hour;
-						if (minute <= 9) minute = "0" + minute;
-						if (second <= 9) second = "0" + second;
-						that.day = day;
-						that.hour = hour;
-						that.minute = minute;
-						that.second = second;
-					} else {
-						that.day = "00";
-						that.hour = "00";
-						that.minute = "00";
-						that.second = "00";
-					}
-				}
-				runTime();
-				setInterval(runTime, 1000);
-			}
-		}
-	};
-</script>
-
-<style>
-	.time{
-		display: flex;
-		justify-content: center;
-	} 
-	.red{
-		color: var(--view-theme);
-		margin: 0 4rpx;
-	}
-</style>

config/app.js

@@ -2,8 +2,8 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： 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`,
 	// #endif
 	

mock/json/diy_res.json

@@ -710,177 +710,6 @@
             },
             "id": "id1665385357481002"
         },
-        "1666235374470004": {
-            "name": "activeParty",
-            "timestamp": "1666235374470004",
-            "setUp": {
-                "tabVal": 1
-            },
-            "titleConfig": {
-                "title": "促销标题",
-                "value": "超值爆款",
-                "place": "请输入标题",
-                "max": 10
-            },
-            "desConfig": {
-                "title": "促销简介",
-                "value": "美好生活由此开始",
-                "place": "请输入简介",
-                "max": 8
-            },
-            "menuConfig": {
-                "title": "最多可添加4个版块，图片建议尺寸140 * 140px；鼠标拖拽左侧圆点可 调整版块顺序",
-                "maxList": 4,
-                "list": [
-                    {
-                        "img": "https://qiniu.crmeb.net/attach/2021/11/16/216aaf8ea5fdeff2a31a48f3e931ff46.jpg",
-                        "info": [
-                            {
-                                "title": "标题",
-                                "value": "今日推荐",
-                                "tips": "选填，不超过4个字",
-                                "max": 4
-                            },
-                            {
-                                "title": "简介",
-                                "value": "店主诚意推荐 品质商品",
-                                "tips": "选填，不超过20个字",
-                                "max": 20
-                            },
-                            {
-                                "title": "链接",
-                                "value": "/pages/columnGoods/HotNewGoods/index?type=1&name=精品推荐",
-                                "tips": "请输入链接",
-                                "max": 100
-                            }
-                        ]
-                    },
-                    {
-                        "img": "https://qiniu.crmeb.net/attach/2021/11/15/1c72a02ad97f695bd85fa04821b72985.jpg",
-                        "info": [
-                            {
-                                "title": "标题",
-                                "value": "热门榜单",
-                                "tips": "选填，不超过4个字",
-                                "max": 4
-                            },
-                            {
-                                "title": "简介",
-                                "value": "店主诚意推荐 品质商品",
-                                "tips": "选填，不超过20个字",
-                                "max": 20
-                            },
-                            {
-                                "title": "链接",
-                                "value": "/pages/columnGoods/HotNewGoods/index?type=2&name=热门榜单",
-                                "tips": "请输入链接",
-                                "max": 100
-                            }
-                        ]
-                    },
-                    {
-                        "img": "https://qiniu.crmeb.net/attach/2021/10/612bb202110121143097664.png",
-                        "info": [
-                            {
-                                "title": "标题",
-                                "value": "首发新品",
-                                "tips": "选填，不超过4个字",
-                                "max": 4
-                            },
-                            {
-                                "title": "简介",
-                                "value": "新品上架等 你来拿",
-                                "tips": "选填，不超过20个字",
-                                "max": 20
-                            },
-                            {
-                                "title": "链接",
-                                "value": "/pages/columnGoods/HotNewGoods/index?type=3&name=首发新品",
-                                "tips": "请输入链接",
-                                "max": 100
-                            }
-                        ]
-                    },
-                    {
-                        "img": "https://qiniu.crmeb.net/attach/2021/10/59c17202110130919585671.png",
-                        "info": [
-                            {
-                                "title": "标题",
-                                "value": "促销单品",
-                                "tips": "选填，不超过4个字",
-                                "max": 4
-                            },
-                            {
-                                "title": "简介",
-                                "value": "综合评选好 产品",
-                                "tips": "选填，不超过20个字",
-                                "max": 20
-                            },
-                            {
-                                "title": "链接",
-                                "value": "/pages/columnGoods/HotNewGoods/index?type=4&name=促销单品",
-                                "tips": "请输入链接",
-                                "max": 100
-                            }
-                        ]
-                    }
-                ]
-            },
-            "themeColor": {
-                "title": "主题颜色",
-                "name": "themeColor",
-                "default": [
-                    {
-                        "item": "#fc3c3e"
-                    }
-                ],
-                "color": [
-                    {
-                        "item": "rgba(29,176,252,1)"
-                    }
-                ]
-            },
-            "bgColor": {
-                "title": "标签背景颜色",
-                "name": "bgColor",
-                "default": [
-                    {
-                        "item": "#F62C2C"
-                    },
-                    {
-                        "item": "#F96E29"
-                    }
-                ],
-                "color": [
-                    {
-                        "item": "rgba(29,176,252,1)"
-                    },
-                    {
-                        "item": "rgba(64,209,244,1)"
-                    }
-                ]
-            },
-            "boxColor": {
-                "title": "背景颜色",
-                "name": "boxColor",
-                "default": [
-                    {
-                        "item": "#ffe5e3"
-                    }
-                ],
-                "color": [
-                    {
-                        "item": "rgba(208,240,255,1)"
-                    }
-                ]
-            },
-            "mbConfig": {
-                "title": "页面间距",
-                "val": 12,
-                "min": 0
-            },
-            "id": "id1665385357481004"
-        },
         "1666235374470005": {
             "name": "combination",
             "timestamp": "1666235374470005",

pages.json

@@ -1112,63 +1112,6 @@
 				}
 			]
 		},
-		{
-			"root": "pages/annex",
-			"pages": [
-				{
-					"path": "web_view/index",
-					"style": {
-						"navigationBarTitleText": "",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "offline_pay/index",
-					"style": {
-						"navigationBarTitleText": "支付",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "offline_result/index",
-					"style": {
-						"navigationBarTitleText": "支付结果",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "special/index",
-					"style": {
-						"navigationBarTitleText": "专题页",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				}
-			]
-		},
 		{
 			"root": "pages/points_mall",
 			"pages": [

pages/annex/applicationRecord/index.vue

@@ -1,209 +0,0 @@
-<template>
-	<view class="">
-		<view class="application-record" v-if="listData.length">
-			<view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
-				<view class="card-top">
-					<view class="title">{{item.mer_name}}</view>
-					<view class="time">{{$t(`提交时间`)}}：{{item.create_time}}</view>
-					<view v-if="item.fail_msg" class="reason">{{$t(`原因`)}}：{{item.fail_msg}}</view>
-				</view>
-				<view class="line"></view>
-				<view class="card-bottom">
-					<view class="card-status">
-						<image class="status-icon" v-if="item.status === 0" src="../static/images/pending.png" mode=""></image>
-						<image class="status-icon" v-else-if="item.status === 1" src="../static/images/passed.png" mode=""></image>
-						<image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.png" mode=""></image>
-						<text class="status-text">{{statusText(item.status)}}</text>
-					</view>
-					<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
-				</view>
-			</view>
-		</view>
-		<view class='no-shop' v-if="!listData.length && !loading">
-			<view class='pictrue' style="margin: 0 auto;">
-				<image src='/static/images/no-shop.png'></image>
-				<text>{{$t(`暂无申请记录，快去申请吧!`)}}</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// import {
-	// 	getApplicationRecordList
-	// } from '@/api/store.js'
-	export default {
-		data() {
-			return {
-				loading: false,
-				listData: [],
-				pageData: {
-					page: 1,
-					limit: 10,
-				}
-			}
-		},
-		onLoad() {
-			// this.getListData()
-		},
-		// 滚动到底部
-		onReachBottom() {
-			if (this.count == this.listData.length) {
-				uni.showToast({
-					title: this.$t(`没有更多啦`),
-					icon: 'none',
-					duration: 1000
-				});
-			} else {
-				this.pageData.page += 1
-				this.getListData()
-			}
-		},
-		methods: {
-			getListData() {
-				this.loading = true
-				uni.showLoading({
-					title: this.$t(`正在加载中`),
-				});
-				getApplicationRecordList(this.pageData).then(res => {
-					console.log(res)
-					this.count = res.data.count
-					this.listData = this.listData.concat(res.data.list)
-					uni.hideLoading();
-					this.loading = false
-				})
-			},
-			// 跳转逻辑
-			jump(item) {
-				console.log(item)
-				if ([0, 2].includes(item.status)) {
-					uni.navigateTo({
-						url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}`
-					})
-				} else if (item.status === 1) {
-					uni.navigateTo({
-						url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}`
-					})
-				}
-			},
-			//状态判断
-			statusText(number) {
-				// 使用对象
-				let statusData = {
-					0: this.$t(`待审核`),
-					1: this.$t(`审核通过`),
-					2: this.$t(`审核未通过`),
-				};
-				return statusData[number]
-			},
-			// button显示文字
-			statusBtn(number) {
-				// 使用对象
-				let statusData = {
-					0: this.$t(`编辑`),
-					1: this.$t(`查看`),
-					2: this.$t(`重新提交`),
-				};
-				return statusData[number]
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main {}
-
-	.application-record {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		background-color: #F5F5F5;
-		padding: 20rpx 30rpx;
-
-		.card-list {
-			width: 100%;
-			background-color: #fff;
-			padding: 20rpx 24rpx;
-			margin: 10rpx 20rpx;
-			border-radius: 12rpx;
-
-			.card-top {
-				height: 140rpx;
-
-				.title {
-					font-size: 28rpx;
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.time {
-					color: #999999;
-					font-size: 24rpx;
-					padding: 5rpx 0;
-				}
-
-				.reason {
-					color: #E93323;
-					font-weight: bold;
-					font-size: 24rpx;
-				}
-			}
-
-			.line {
-				height: 2rpx;
-				margin: 20rpx 0 20rpx 0;
-				background-color: #EEEEEE;
-			}
-
-			.card-bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				color: #333;
-
-				.card-status {
-					display: flex;
-					align-items: center;
-
-					.status-icon {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 10rpx;
-					}
-
-					.status-text {
-						font-size: 28rpx;
-						font-weight: 500;
-					}
-				}
-
-				.status-btn {
-					font-size: 26rpx;
-					color: #555;
-					border: 1px solid #999999;
-					padding: 8rpx 32rpx;
-					border-radius: 40rpx;
-				}
-			}
-		}
-
-	}
-
-	.no-shop {
-		width: 100%;
-		background-color: #fff;
-		height: 100vh;
-
-		.pictrue {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			color: $uni-nothing-text;
-
-			image {
-				width: 414rpx;
-				height: 380rpx;
-			}
-		}
-	}
-</style>

pages/annex/offline_pay/index.vue

@@ -1,464 +0,0 @@
-<template>
-	<form class="form" @submit="checkForm">
-		<view class="input-section">
-			<view class="section-hd">{{$t(`支付金额`)}}</view>
-			<view class="section-bd">
-				<view class="input-group">
-					{{$t(`￥`)}}
-					<input v-model.number="money" class="input" name="money" type="digit" @input="inputChange" placeholder="0.00" />
-				</view>
-				<view v-if="payPrice" class="discount">{{$t(`会员优惠价`)}}：{{$t(`￥`)}}{{ payPrice }}</view>
-			</view>
-		</view>
-		<view class="radio-section">
-			<view class="section-hd">{{$t(`支付方式`)}}</view>
-			<radio-group class="section-bd" name="method">
-				<label class="item" v-if="yuePay">
-					<text class="iconfont icon-yue"></text>
-					<text class="name">
-						{{$t(`余额支付`)}}
-						<text class="money">{{$t(`可用余额`)}}:{{$t(`￥`)}}{{ now_money || 0 }}</text>
-					</text>
-					<radio value="yue" :checked="payType === 'yue'" />
-				</label>
-				<label v-if="wxpay" class="item">
-					<text class="iconfont icon-weixinzhifu"></text>
-					<text class="name">{{$t(`微信支付`)}}</text>
-					<radio value="weixin" :checked="payType === 'weixin'" />
-				</label>
-			</radio-group>
-		</view>
-		<button class="button" form-type="submit">{{$t(`确认`)}}</button>
-		<view class="alipay" v-html="alipayHtml"></view>
-	</form>
-</template>
-
-<script>
-	import {
-		offlineCheckPrice,
-		offlineCreate,
-		orderOfflinePayType
-	} from '@/api/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	const app = getApp();
-	export default {
-		data() {
-			return {
-				money: '',
-				payPrice: '',
-				payType: 'weixin',
-				alipayHtml: '',
-				alipay: false,
-				wxpay: false,
-				yuePay: false,
-				paying: false,
-				now_money: 0,
-				isWeixin: false,
-				site_name: '',
-				isCommitted: false
-			};
-		},
-		watch: {
-			money(newValue, oldValue) {
-				if (newValue && typeof newValue === 'number') {
-					this.checkPrice();
-				} else {
-					this.payPrice = '';
-				}
-			}
-		},
-		computed: mapGetters(['isLogin']),
-		onLoad(options) {
-			if (!this.isLogin) {
-				toLogin()
-			}
-			// #ifdef H5
-			if (options.code) {
-				let spread = app.globalData.spid ? app.globalData.spid : '';
-				wechatAuthV2(options.code, spread).then(res => {
-					location.href = decodeURIComponent(
-						decodeURIComponent(options.back_url)
-					)
-				})
-			}
-			// #endif
-		},
-		onShow() {
-			if (this.isLogin) {
-				this.getPayType();
-			}
-			//#ifdef H5
-			this.isWeixin = this.$wechat.isWeixin();
-			//#endif
-		},
-		methods: {
-			inputChange(e){
-				var that = this
-				e.target.value = (e.target.value.match(/^\d*(.?\d{0,2})/g)[0]) || ""
-				this.$nextTick(() => {
-					this.money = e.target.value
-					this.checkPrice()
-				})
-			},
-			getPayType() {
-				orderOfflinePayType()
-					.then(res => {
-						const {
-							ali_pay_status,
-							pay_weixin_open,
-							yue_pay_status,
-							offline_pay_status,
-							site_name,
-							now_money
-						} = res.data;
-						this.alipay = ali_pay_status === '1' ? true : false;
-						this.wxpay = pay_weixin_open === 1 ? true : false;
-						this.yuePay = yue_pay_status === 1 ? true : false;
-						this.now_money = now_money;
-						this.site_name = site_name;
-						if (!offline_pay_status) {
-							uni.showModal({
-								title: this.$t(`支付提醒`),
-								content: this.$t(`线下支付已关闭，请点击确认按钮返回主页`),
-								showCancel: false,
-								success() {
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								}
-							});
-						}
-						if (site_name) {
-							uni.setNavigationBarTitle({
-								title: site_name
-							});
-						}
-					})
-					.catch(err => {
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						});
-					});
-			},
-			checkForm(e) {
-				const {
-					money,
-					method
-				} = e.detail.value;
-				if (money) {
-					this.combData(method);
-				} else {
-					uni.showToast({
-						title: this.$t(`请输入支付金额`),
-						icon: 'none'
-					});
-				}
-			},
-			// 优惠价
-			checkPrice() {
-				offlineCheckPrice({
-						pay_price: this.money
-					})
-					.then(res => {
-						this.payPrice = res.data.pay_price;
-					})
-					.catch(err => {
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						});
-					});
-			},
-			// 组合数据
-			combData(payType) {
-				let data = {
-					type: 3,
-					pay_type: payType,
-					from: 'weixinh5',
-					price: this.payPrice || this.money,
-					money: this.money
-				};
-				
-				// #ifdef H5
-				if (this.isWeixin) {
-					data.from = 'weixin';
-				}
-				// #endif
-				// #ifdef MP
-				data.from = 'routine';
-				// #endif
-				if (this.paying) {
-					return;
-				}
-				this.paying = true;
-				uni.showLoading({
-					title: this.$t(`正在确认`)
-				});
-				offlineCreate(data)
-					.then(res => {
-						uni.hideLoading();
-						this.callPay(res);
-					})
-					.catch(err => {
-						this.paying = false;
-						uni.showToast({
-							title: err,
-							icon: 'none'
-						});
-					});
-			},
-			// 调用支付
-			callPay(res) {
-				const {
-					status,
-					result
-				} = res.data, {
-						orderId,
-						jsConfig
-					} = result,
-					goPages = '/pages/annex/offline_result/index?site_name=' + this.site_name;
-				switch (status) {
-					case 'ORDER_EXIST':
-					case 'EXTEND_ORDER':
-					case 'PAY_ERROR':
-						this.paying = false;
-						this.$util.Tips({
-							title: res.msg
-						}, {
-							tab: 5,
-							url: goPages
-						});
-						break;
-					case 'SUCCESS':
-						this.paying = false;
-						this.money = '';
-						this.$util.Tips({
-							title: res.msg,
-							icon: 'success'
-						}, {
-							tab: 5,
-							url: goPages
-						});
-						break;
-					case 'WECHAT_PAY':
-						// #ifdef MP
-						let that = this;
-						let mp_pay_name=''
-						if(uni.requestOrderPayment){
-							mp_pay_name='requestOrderPayment'
-						}else{
-							mp_pay_name='requestPayment'
-						}
-						uni[mp_pay_name]({
-							timeStamp: jsConfig.timestamp,
-							nonceStr: jsConfig.nonceStr,
-							package: jsConfig.package,
-							signType: jsConfig.signType,
-							paySign: jsConfig.paySign,
-							success: function(res) {
-								that.$util.Tips({
-									title: that.$t(`支付成功`),
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: '/pages/annex/offline_result/index'
-								});
-							},
-							fail: function() {
-								uni.showToast({
-									title: that.$t(`取消支付`),
-									icon: 'none',
-									success: function() {
-										that.paying = false;
-									}
-								});
-							},
-							complete: function() {
-								that.paying = false;
-								uni.hideLoading();
-							}
-						});
-						// #endif
-						// #ifndef MP
-						this.$wechat
-							.pay(result.jsConfig)
-							.then(res => {
-								this.paying = false;
-								this.$util.Tips({
-									title: this.$t(`支付成功`),
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: '/pages/annex/offline_result/index'
-								});
-							})
-							.catch(err => {
-								this.paying = false;
-								if (err.errMsg == 'chooseWXPay:cancel') {
-									uni.showToast({
-										title: this.$t(`取消支付`),
-										icon: 'none'
-									});
-								}
-							});
-						// #endif
-						break;
-					case 'PAY_DEFICIENCY':
-						this.paying = false;
-						this.$util.Tips({
-							title: res.msg
-						});
-						break;
-					case 'WECHAT_H5_PAY':
-						this.paying = false;
-						uni.showToast({
-							title: res.msg,
-							success() {
-								location.href = jsConfig.mweb_url;
-							}
-						});
-						break;
-					case 'ALIPAY_PAY':
-						this.paying = false;
-						// #ifdef H5
-						if (this.$wechat.isWeixin()) {
-							uni.navigateTo({
-								url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
-							});
-						} else {
-							this.alipayHtml = jsConfig;
-							this.$nextTick(() => {
-								document.getElementById('alipaysubmit').submit();
-							});
-						}
-						// #endif
-						// #ifdef MP
-						uni.navigateTo({
-							url: `/pages/users/alipay_invoke/index?id=${orderId}&link=${jsConfig.qrCode}`
-						});
-						// #endif
-						break;
-				}
-			}
-		}
-	};
-</script>
-
-<style>
-	page {
-		background-color: #ffffff;
-	}
-</style>
-
-<style lang="scss" scoped>
-	/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
-	    border: 1px solid #FDC383 !important;
-	    background-color: #FDC383 !important;
-	}
-	.input-section {
-		.section-hd {
-			padding: 30rpx;
-			font-size: 28rpx;
-			color: #666666;
-		}
-
-		.section-bd {
-			padding-right: 30rpx;
-			padding-left: 30rpx;
-		}
-
-		.input-group {
-			display: flex;
-			align-items: flex-end;
-			padding: 45rpx 20rpx 47rpx;
-			font-size: 80rpx;
-			color: #999999;
-		}
-
-		.input {
-			flex: 1;
-			height: 110rpx;
-			margin-left: 15rpx;
-			font-size: 100rpx;
-			color: #282828;
-		}
-
-		.discount {
-			padding: 27rpx 20rpx;
-			border-top: 1rpx solid #eeeeee;
-			font-size: 28rpx;
-			color: #e93323;
-		}
-	}
-
-	.radio-section {
-		border-top: 20rpx solid #f5f5f5;
-
-		.section-hd {
-			padding: 30rpx;
-			font-size: 28rpx;
-			color: #666666;
-		}
-
-		.section-bd {
-			padding-left: 50rpx;
-		}
-
-		.item {
-			display: flex;
-			align-items: center;
-			padding-top: 30rpx;
-			padding-right: 30rpx;
-			padding-bottom: 30rpx;
-			border-bottom: 1rpx solid #f5f5f5;
-		}
-
-		.iconfont {
-			font-size: 44rpx;
-		}
-
-		.icon-yue {
-			color: #fe960f;
-		}
-
-		.icon-weixinzhifu {
-			color: #41b035;
-		}
-
-		.icon-zhifubao {
-			color: #099bdf;
-		}
-
-		.name {
-			flex: 1;
-			margin-left: 30rpx;
-			font-size: 30rpx;
-			color: #333333;
-		}
-
-		.money {
-			float: right;
-			padding-right: 20rpx;
-			font-size: 20rpx;
-		}
-	}
-
-	.button {
-		height: 86rpx;
-		border-radius: 43rpx;
-		margin: 114rpx 30rpx 30rpx;
-		background: linear-gradient(90deg, #FEE2B7 0%, #FDC383 100%);
-		font-size: 30rpx;
-		line-height: 86rpx;
-		color: #5D3324;
-	}
-	.alipay {
-		display: none;
-	}
-</style>

pages/annex/offline_result/index.vue

@@ -1,64 +0,0 @@
-<template>
-	<view>
-		<view class="result">
-			<!-- <view class="image-wrap"><image class="image" src="../static/offline-result.png"></image></view> -->
-			<view class="text">{{$t(`支付成功`)}}</view>
-		</view>
-		<navigator class="link"  url="/pages/index/index" open-type="switchTab">{{$t(`进入商城`)}}</navigator>
-	</view>
-</template>
-
-<script>
-export default {
-	onLoad(options) {
-		let site_name = options.site_name || '';
-		if (site_name) {
-			uni.setNavigationBarTitle({
-				title: site_name
-			});
-		}
-	}
-};
-</script>
-
-<style>
-page {
-	background-color: #fff;
-}
-</style>
-
-<style lang="scss" scoped>
-.result {
-	margin-top: 200rpx;
-
-	.image-wrap {
-		width: 267rpx;
-		height: 223rpx;
-		margin: 0 auto;
-	}
-
-	.image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.text {
-		margin-top: 46rpx;
-		font-size: 34rpx;
-		text-align: center;
-		color: #282828;
-	}
-}
-
-.link {
-	width: 560rpx;
-	height: 86rpx;
-	border: 1rpx solid #F19D2F;
-	border-radius: 43rpx;
-	margin: 90rpx auto 0;
-	font-size: 30rpx;
-	line-height: 86rpx;
-	text-align: center;
-	color: #F19D2F;
-}
-</style>

pages/annex/special/index.vue

@@ -1,575 +0,0 @@
-<template>
-	<view v-if="pageShow" class="page"
-		:class="bgTabVal==2?'fullsize noRepeat':bgTabVal==1?'repeat ysize':'noRepeat ysize'"
-		:style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'">
-		<view :style="{ marginTop: sortMpTop + 'px' }">
-			<!-- #ifdef H5 -->
-			<view v-for="(item, index) in styleConfig" :key="index">
-				<component :is="item.name" :index="index" :dataConfig="item" @changeBarg="changeBarg"
-					@changeTab="changeTab" :tempArr="tempArr" :iSshowH="iSshowH" @detail="goDetail"></component>
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef MP || APP-PLUS-->
-			<block v-for="(item, index) in styleConfig" :key="index">
-				<activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty>
-				<articleList v-if="item.name == 'articleList'" :dataConfig="item"></articleList>
-				<bargain v-if="item.name == 'bargain'" :dataConfig="item" @changeBarg="changeBarg"></bargain>
-				<blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage>
-				<combination v-if="item.name == 'combination'" :dataConfig="item"></combination>
-				<coupon v-if="item.name == 'coupon'" :dataConfig="item"></coupon>
-				<customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService>
-				<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
-				<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
-				<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item" :special="1"></headerSerch>
-				<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
-				<menus v-if="item.name == 'menus'" :dataConfig="item"></menus>
-				<news v-if="item.name == 'news'" :dataConfig="item"></news>
-				<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item" :isSortType="isSortType">
-				</pictureCube>
-				<promotionList v-if="item.name == 'promotionList'" :dataConfig="item" @changeTab="changeTab"
-					:tempArr="tempArr" :iSshowH="iSshowH" @detail="goDetail"></promotionList>
-				<richText v-if="item.name == 'richText'" :dataConfig="item"></richText>
-				<seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill>
-				<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-				<swipers v-if="item.name == 'swipers'" :dataConfig="item"></swipers>
-				<tabNav v-if="item.name == 'tabNav'" :dataConfig="item"></tabNav>
-				<titles v-if="item.name == 'titles'" :dataConfig="item"></titles>
-			</block>
-			<!-- #endif -->
-			<view class="loadingicon acea-row row-center-wrapper"
-				v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
-				<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
-				{{ loadTitle }}
-			</view>
-			<view class="foot" v-if="newData.menuList && footerStatus">
-				<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-					<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
-						@click="goRouter(item)">
-						<block v-if="item.link == activeRouter">
-							<image :src="item.imgList[0]"></image>
-							<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}</view>
-						</block>
-						<block v-else>
-							<image :src="item.imgList[1]"></image>
-							<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
-						</block>
-						<div class="count-num"
-							v-if="item.link === '/pages/order_addcart/order_addcart' && $store.state.indexData.cartNum && $store.state.indexData.cartNum > 0">
-							{{$store.state.indexData.cartNum}}
-						</div>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	const app = getApp();
-	import {
-		getCouponV2,
-		getCouponNewUser
-	} from '@/api/api.js'
-	import {
-		getShare
-	} from '@/api/public.js';
-	// #ifdef H5
-	import mConfig from '@/pages/index/diy/components/index.js';
-	// #endif
-	// #ifdef MP || APP-PLUS
-	import authorize from '@/components/Authorize';
-	import activeParty from '@/pages/index/diy/components/activeParty';
-	import headerSerch from '@/pages/index/diy/components/headerSerch';
-	import swipers from '@/pages/index/diy/components/swipers';
-	import coupon from '@/pages/index/diy/components/coupon';
-	import articleList from '@/pages/index/diy/components/articleList';
-	import bargain from '@/pages/index/diy/components/bargain';
-	import blankPage from '@/pages/index/diy/components/blankPage';
-	import combination from '@/pages/index/diy/components/combination';
-	import customerService from '@/pages/index/diy/components/customerService';
-	import goodList from '@/pages/index/diy/components/goodList';
-	import guide from '@/pages/index/diy/components/guide';
-	import liveBroadcast from '@/pages/index/diy/components/liveBroadcast';
-	import menus from '@/pages/index/diy/components/menus';
-	import news from '@/pages/index/diy/components/news';
-	import promotionList from '@/pages/index/diy/components/promotionList';
-	import richText from '@/pages/index/diy/components/richText';
-	import seckill from '@/pages/index/diy/components/seckill';
-	import swiperBg from '@/pages/index/diy/components/swiperBg';
-	import tabNav from '@/pages/index/diy/components/tabNav';
-	import titles from '@/pages/index/diy/components/titles';
-	import pictureCube from '@/pages/index/diy/components/pictureCube';
-
-	import {
-		getTempIds
-	} from '@/api/api.js';
-	import {
-		SUBSCRIBE_MESSAGE,
-		TIPS_KEY
-	} from '@/config/cache';
-
-	// #endif
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		getDiy,
-		getIndexData
-	} from '@/api/api.js';
-	import {
-		getGroomList
-	} from '@/api/store.js';
-	import {
-		goShopDetail
-	} from '@/libs/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import pageFooter from '@/components/pageFooter/index.vue'
-	export default {
-		computed: mapGetters(['isLogin', 'uid']),
-		components: {
-			pageFooter,
-			// #ifdef H5
-			...mConfig,
-			// #endif
-			// #ifdef MP || APP-PLUS
-			authorize,
-			activeParty,
-			headerSerch,
-			swipers,
-			coupon,
-			articleList,
-			bargain,
-			blankPage,
-			combination,
-			customerService,
-			goodList,
-			guide,
-			liveBroadcast,
-			menus,
-			news,
-			promotionList,
-			richText,
-			seckill,
-			swiperBg,
-			tabNav,
-			titles,
-			pictureCube
-			// #endif
-		},
-		computed: mapGetters(['isLogin']),
-		data() {
-			return {
-				styleConfig: [],
-				tempArr: [],
-				goodType: 3,
-				loading: false,
-				loadend: false,
-				loadTitle: this.$t(`加载更多`), //提示语
-				page: 1,
-				limit: this.$config.LIMIT,
-				iSshowH: false,
-				numConfig: 0,
-				code: '',
-				isCouponShow: false,
-				couponObj: {},
-				couponObjs: {},
-				shareInfo: {},
-				footConfig: {},
-				pageId: '',
-				sortMpTop: 0,
-				newData: {},
-				activeRouter: '',
-				footerStatus: false,
-				bgColor: '',
-				bgPic: '',
-				bgTabVal: '',
-				pageShow: true,
-				windowHeight: 0
-			};
-		},
-		onLoad(options) {
-			console.log(options)
-			let that = this
-			this.$nextTick(function() {
-				uni.getSystemInfo({
-					success: function(res) {
-						that.windowHeight = res.windowHeight;
-					}
-				});
-			})
-			const {
-				state,
-				scope
-			} = options;
-			this.pageId = options.id
-			// #ifdef MP
-			if (options.scene) {
-				let value = that.$util.getUrlParams(decodeURIComponent(options.scene));
-				this.pageId = value.id
-			}
-			// #endif
-			uni.setNavigationBarTitle({
-				title: this.$t(`专题栏`)
-			});
-
-			// #ifdef APP-PLUS
-			this.sortMpTop = -50
-			// #endif
-			uni.getLocation({
-				type: 'wgs84',
-				success: function(res) {
-					try {
-						uni.setStorageSync('user_latitude', res.latitude);
-						uni.setStorageSync('user_longitude', res.longitude);
-					} catch {}
-				}
-			});
-			this.diyData();
-			this.getIndexData();
-			// #ifdef H5
-			this.setOpenShare();
-			// #endif
-			// #ifdef MP || APP-PLUS
-			this.getTempIds();
-			// #endif
-			getShare().then(res => {
-				this.shareInfo = res.data;
-			})
-			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			let curRoute = routes[routes.length - 1].route //获取当前页面路由
-			this.activeRouter = '/' + curRoute + '?id=' + this.pageId
-		},
-		watch: {
-			isLogin: {
-				deep: true, //深度监听设置为 true
-				handler: function(newV, oldV) {
-					// 优惠券弹窗
-					var newDates = new Date().toLocaleDateString();
-					if (newV) {
-						try {
-							var oldDate = uni.getStorageSync('oldDate') || ''
-						} catch {}
-						if (oldDate != newDates) {
-							this.getCoupon();
-
-						}
-					}
-				}
-			}
-		},
-		mounted() {
-			// 优惠券弹窗
-			var newDates = new Date().toLocaleDateString();
-			if (this.isLogin) {
-				try {
-					var oldDate = uni.getStorageSync('oldDate') || ''
-				} catch {}
-				if (oldDate != newDates) {
-					this.getCoupon();
-				}
-				let oldUser = uni.getStorageSync('oldUser') || 0;
-				if (!oldUser) {
-					this.getCouponOnce();
-				}
-			}
-		},
-		mounted() {},
-		methods: {
-			goRouter(item) {
-				var pages = getCurrentPages();
-				var page = (pages[pages.length - 1]).$page.fullPath;
-				if (item.link == page) return
-				uni.switchTab({
-					url: item.link,
-					fail(err) {
-						uni.redirectTo({
-							url: item.link
-						})
-					}
-				})
-			},
-			// 新用户优惠券
-			getCouponOnce() {
-				getCouponNewUser().then(res => {
-					this.couponObjs = res.data;
-				});
-			},
-			couponCloses() {
-				this.couponObjs.show = false;
-				try {
-					uni.setStorageSync('oldUser', 1);
-				} catch (e) {
-
-				}
-			},
-			// 优惠券弹窗
-			getCoupon() {
-				getCouponV2().then(res => {
-					this.couponObj = res.data
-					if (res.data.list.length > 0) {
-						this.isCouponShow = true
-					}
-				})
-			},
-			// 优惠券弹窗关闭
-			couponClose() {
-				this.isCouponShow = false
-				try {
-					uni.setStorageSync('oldDate', new Date().toLocaleDateString());
-				} catch {}
-			},
-			onLoadFun() {},
-			// #ifdef H5
-			// 获取url后面的参数
-			getQueryString(name) {
-				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-				var reg_rewrite = new RegExp("(^|/)" + name + "/([^/]*)(/|$)", "i");
-				var r = window.location.search.substr(1).match(reg);
-				var q = window.location.pathname.substr(1).match(reg_rewrite);
-				if (r != null) {
-					return unescape(r[2]);
-				} else if (q != null) {
-					return unescape(q[2]);
-				} else {
-					return null;
-				}
-			},
-			// #endif
-
-			// #ifdef MP || APP-PLUS
-			getTempIds() {
-				let messageTmplIds = wx.getStorageSync(SUBSCRIBE_MESSAGE);
-				if (!messageTmplIds) {
-					// getTempIds().then(res => {
-					// 	if (res.data) wx.setStorageSync(SUBSCRIBE_MESSAGE, JSON.stringify(res.data));
-					// });
-				}
-			},
-			// #endif
-			// 对象转数组
-			objToArr(data) {
-				console.log(data)
-				if(!data) return
-				const keys = Object.keys(data)
-				keys.sort((a, b) => a - b)
-				const m = keys.map(key => data[key]);
-				return m;
-			},
-			diyData() {
-				let that = this;
-				getDiy(this.pageId).then(res => {
-					let data = res.data;
-					if (res.data.length == 0) {
-						return this.$util.Tips({
-							title: this.$t(`暂无数据`)
-						}, {
-							tab: 3
-						})
-					}
-
-					if (data.is_bg_color) {
-						this.bgColor = data.color_picker
-					}
-					if (data.is_bg_pic) {
-						this.bgPic = data.bg_pic
-						this.bgTabVal = data.bg_tab_val
-					}
-					this.pageShow = data.is_show
-					uni.setNavigationBarTitle({
-						title: res.data.title
-					})
-					let temp = []
-					console.log(res.data)
-					let lastArr = that.objToArr(res.data.value)
-					lastArr.forEach((item, index, arr) => {
-						if (item.name == 'pageFoot') {
-							uni.setStorageSync('pageFoot', item)
-							that.$store.commit('FOOT_UPLOAD', item)
-							arr.splice(index, 1)
-							this.newData = item
-							this.footerStatus = item.status.status
-						}
-						if (item.name == 'promotionList') {
-							that.numConfig = item.numConfig.val;
-							that.getGroomList();
-						}
-						temp = arr
-					});
-					that.styleConfig = temp;
-				});
-			},
-			getIndexData() {},
-			changeBarg(item) {
-				if (!this.isLogin) {
-					toLogin();
-				} else {
-					uni.navigateTo({
-						url: `/pages/activity/goods_bargain_details/index?id=${item.id}&bargain=${this.uid}`
-					});
-				}
-			},
-			// 促销列表的点击事件；
-			changeTab(type) {
-				this.goodType = type;
-				this.tempArr = [];
-				this.page = 1;
-				this.loadend = false;
-				let onloadH = true;
-				this.getGroomList(onloadH);
-			},
-			// 精品推荐
-			getGroomList(onloadH) {
-				let that = this;
-				let type = that.goodType;
-				if (that.loadend) return false;
-				if (that.loading) return false;
-				if (onloadH) {
-					that.$set(that, 'iSshowH', true);
-				}
-				getGroomList(type, {
-						page: that.page,
-						limit: that.limit
-					})
-					.then(({
-						data
-					}) => {
-						that.$set(that, 'iSshowH', false);
-						let maxPage = Math.ceil(this.numConfig / this.limit);
-						let list = data.list,
-							loadend = list.length < that.limit || that.page >= maxPage;
-						let tempArr = that.$util.SplitArray(list, that.tempArr);
-						that.$set(that, 'tempArr', tempArr.slice(0, this.numConfig));
-						that.loadend = loadend;
-						that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
-						that.page = that.page + 1;
-						that.loading = false;
-					})
-					.catch(res => {
-						that.loading = false;
-						that.loadTitle = that.$t(`加载更多`);
-					});
-			},
-			goDetail(item) {
-
-				goShopDetail(item, this.uid).then(res => {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.id}`
-					});
-				});
-
-			},
-			// #ifdef H5
-			// 微信分享；
-			setOpenShare: function() {
-				let that = this;
-				if (that.$wechat.isWeixin()) {
-					getShare().then(res => {
-						let data = res.data.data;
-						let configAppMessage = {
-							desc: data.synopsis,
-							title: data.title,
-							link: location.href,
-							imgUrl: data.img
-						};
-						that.$wechat.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData'],
-							configAppMessage);
-					});
-				}
-			}
-			// #endif
-		},
-		onReachBottom: function() {
-			this.getGroomList();
-		},
-		//#ifdef MP || APP-PLUS
-		onShareAppMessage() {
-			return {
-				title: this.shareInfo.title,
-				path: '/pages/index/index',
-				imageUrl: this.storeInfo.img,
-			};
-		},
-		//#endif
-	};
-</script>
-
-<style lang="scss">
-	.page {
-		padding-bottom: 50px;
-	}
-
-	.ysize {
-		background-size: 100%;
-	}
-
-	.fullsize {
-		background-size: 100% 100%;
-	}
-
-	.repeat {
-		background-repeat: repeat;
-	}
-
-	.noRepeat {
-		background-repeat: no-repeat;
-	}
-
-	.page-footer {
-		position: fixed;
-		bottom: 0;
-		z-index: 30;
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-		width: 100%;
-		height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		box-sizing: border-box;
-		border-top: solid 1rpx #F3F3F3;
-		background-color: #fff;
-		box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
-		padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
-		padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-
-		.foot-item {
-			display: flex;
-			width: max-content;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			position: relative;
-
-			.count-num {
-				position: absolute;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 40rpx;
-				height: 40rpx;
-				top: 0rpx;
-				right: -15rpx;
-				color: #fff;
-				font-size: 20rpx;
-				background-color: #FD502F;
-				border-radius: 50%;
-				padding: 4rpx;
-			}
-		}
-
-		.foot-item image {
-			height: 50rpx;
-			width: 50rpx;
-			text-align: center;
-			margin: 0 auto;
-		}
-
-		.foot-item .txt {
-			font-size: 24rpx;
-
-
-			&.active {}
-		}
-	}
-</style>

pages/annex/static/settledSuccessful.svg

@@ -1,65 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="378" height="314" viewBox="0 0 378 314">
-  <defs>
-    <linearGradient id="linear-gradient" x1="0.5" x2="0.621" y2="1" gradientUnits="objectBoundingBox">
-      <stop offset="0" stop-color="#ffbc6c"/>
-      <stop offset="1" stop-color="#fd8a24"/>
-    </linearGradient>
-    <linearGradient id="linear-gradient-2" x1="0.054" y1="1" x2="0.559" y2="0.427" gradientUnits="objectBoundingBox">
-      <stop offset="0" stop-color="#fd9c46"/>
-      <stop offset="1" stop-color="#fc9235"/>
-    </linearGradient>
-  </defs>
-  <g id="组_3776" data-name="组 3776" transform="translate(-186 -260)">
-    <g id="矩形_1754" data-name="矩形 1754" transform="translate(186 260)" fill="#fff" stroke="#707070" stroke-width="1" opacity="0">
-      <rect width="378" height="314" stroke="none"/>
-      <rect x="0.5" y="0.5" width="377" height="313" fill="none"/>
-    </g>
-    <g id="组_3775" data-name="组 3775" transform="translate(11 13)">
-      <g id="组_3733" data-name="组 3733" transform="translate(5 4)">
-        <line id="直线_2" data-name="直线 2" x2="91.209" transform="translate(390.71 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <line id="直线_3" data-name="直线 3" y1="45.162" transform="translate(481.919 321.419)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <line id="直线_4" data-name="直线 4" x2="40.734" transform="translate(441.185 366.581)" fill="none" stroke="#fff0de" stroke-width="2"/>
-        <circle id="椭圆_13" data-name="椭圆 13" cx="4.5" cy="4.5" r="4.5" transform="translate(477 317)" fill="#fff0de"/>
-        <circle id="椭圆_14" data-name="椭圆 14" cx="4.5" cy="4.5" r="4.5" transform="translate(477 362)" fill="#fff0de"/>
-      </g>
-      <rect id="矩形_1736" data-name="矩形 1736" width="170" height="96" rx="4" transform="translate(206 385)" fill="#fff0de" opacity="0.35"/>
-      <rect id="矩形_1738" data-name="矩形 1738" width="161" height="134" rx="4" transform="translate(356 414)" fill="#fff0de" opacity="0.35"/>
-      <rect id="矩形_1735" data-name="矩形 1735" width="130" height="72" rx="4" transform="translate(226 397)" fill="#fff0de"/>
-      <rect id="矩形_1739" data-name="矩形 1739" width="123" height="77" rx="4" transform="translate(375 425)" fill="#fff0de"/>
-      <rect id="矩形_1740" data-name="矩形 1740" width="36" height="22" rx="4" transform="translate(462 511)" fill="#fff0de"/>
-      <rect id="矩形_1737" data-name="矩形 1737" width="155" height="74" rx="4" transform="translate(266 300)" fill="#fff0de"/>
-      <g id="椭圆_15" data-name="椭圆 15" transform="translate(491 281)" fill="none" stroke="#ffdeb7" stroke-width="2">
-        <circle cx="7" cy="7" r="7" stroke="none"/>
-        <circle cx="7" cy="7" r="6" fill="none"/>
-      </g>
-      <g id="椭圆_17" data-name="椭圆 17" transform="translate(468 299)" fill="none" stroke="#ffdeb7" stroke-width="1">
-        <circle cx="4.5" cy="4.5" r="4.5" stroke="none"/>
-        <circle cx="4.5" cy="4.5" r="4" fill="none"/>
-      </g>
-      <circle id="椭圆_19" data-name="椭圆 19" cx="3" cy="3" r="3" transform="translate(260 527)" fill="#ffdeb7"/>
-      <g id="椭圆_20" data-name="椭圆 20" transform="translate(221 502)" fill="none" stroke="#ffdeb7" stroke-width="2">
-        <circle cx="8.5" cy="8.5" r="8.5" stroke="none"/>
-        <circle cx="8.5" cy="8.5" r="7.5" fill="none"/>
-      </g>
-      <circle id="椭圆_18" data-name="椭圆 18" cx="2.5" cy="2.5" r="2.5" transform="translate(391 283)" fill="#ffdeb7"/>
-      <g id="组_3734" data-name="组 3734" transform="translate(-16.078 -39.078)">
-        <rect id="矩形_1741" data-name="矩形 1741" width="21" height="5" rx="2.5" transform="translate(447.078 309.078)" fill="#ffdeb7"/>
-        <rect id="矩形_1742" data-name="矩形 1742" width="21" height="5" rx="2.5" transform="translate(455.078 322.078) rotate(-90)" fill="#ffdeb7"/>
-        <circle id="椭圆_16" data-name="椭圆 16" cx="2.5" cy="2.5" r="2.5" transform="translate(455.078 309.078)" fill="#fff"/>
-      </g>
-      <g id="组_3726" data-name="组 3726" transform="translate(290.558 342.65)">
-        <path id="减去_3" data-name="减去 3" d="M106.857,175.894H16a16,16,0,0,1-16-16V16A16,16,0,0,1,16,0H140.351a16,16,0,0,1,16,16v86.214A44.408,44.408,0,0,0,91.626,160.06a44.708,44.708,0,0,0,15.228,15.832Z" transform="translate(0 0)" fill="#f9c98f" stroke="rgba(0,0,0,0)" stroke-width="1"/>
-        <path id="减去_4" data-name="减去 4" d="M106.855,175.9H15.634A15.653,15.653,0,0,1,0,160.258V15.634A15.652,15.652,0,0,1,15.634,0H97.719l58.633,58.631v43.588a44.409,44.409,0,1,0-49.506,73.671Z" transform="translate(0.004 0)" stroke="rgba(0,0,0,0)" stroke-width="1" fill="url(#linear-gradient)"/>
-        <path id="圆角矩形_2" data-name="圆角矩形 2" d="M491.632,613.632H445.344A12.344,12.344,0,0,1,433,601.288V555" transform="translate(-335.278 -555)" fill="url(#linear-gradient-2)"/>
-        <rect id="矩形_95" data-name="矩形 95" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 51.312)" fill="#fff"/>
-        <rect id="矩形_94" data-name="矩形 94" width="78.942" height="11.841" rx="5.921" transform="translate(11.842 78.942)" fill="#fff"/>
-        <rect id="矩形_96" data-name="矩形 96" width="55.259" height="11.841" rx="5.921" transform="translate(11.842 23.683)" fill="#fff"/>
-        <g id="椭圆_6" data-name="椭圆 6" transform="translate(91.772 99.665)" fill="none" stroke="#fd8a24" stroke-width="6">
-          <circle cx="38.484" cy="38.484" r="38.484" stroke="none"/>
-          <circle cx="38.484" cy="38.484" r="35.484" fill="none"/>
-        </g>
-        <path id="路径_1446" data-name="路径 1446" d="M0,25.784V0H16.317" transform="translate(128.942 147.286) rotate(-135)" fill="none" stroke="#fd8a24" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/>
-      </g>
-    </g>
-  </g>
-</svg>

pages/annex/web_view/index.vue

@@ -1,30 +0,0 @@
-<template>
-	<web-view class="web-view" :webview-styles="webviewStyles" :src="url" :style="{width: windowW + 'px', height: windowH + 'px'}"></web-view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				windowH: 0,
-				windowW: 0,
-				webviewStyles: {
-					progress: {
-						color: 'transparent'
-					}
-				},
-				url: ''
-			}
-		},
-		onLoad(option) {
-			this.url = option.url;
-			try {
-				const res = uni.getSystemInfoSync();
-				this.windowW = res.windowWidth;
-				this.windowH = res.windowHeight;
-			} catch (e) {
-				// error
-			}
-		}
-	}
-</script>

pages/index/diy/components/activeParty.vue

@@ -1,195 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<view class="explosion" :style="'margin-top:' + mbConfig*2 +'rpx;background-color:' + boxColor+';'"
-			v-if="explosiveMoney.length">
-			<view class="hd skeleton-rect">
-				<!-- <image src="/static/images/explosion-title.png" mode=""></image> -->
-				<view class="title" :style="'color:'+themeColor+';'">{{titleConfig}}</view>
-				<view class="txt"
-					:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 0%, '+ bgColor[1].item +' 100%);'">
-					{{desConfig}}
-				</view>
-			</view>
-			<view class="bd">
-				<view class="item skeleton-rect" @click="goDetail(item)" v-for="(item,index) in explosiveMoney" :key="index">
-					<view class="con-box">
-						<view class="title line1">{{item.info[0].value}}</view>
-						<view class="con line2">{{item.info[1].value}}</view>
-						<view class="go">GO！<image src="/static/images/right-icon.png" mode=""></image>
-						</view>
-					</view>
-					<image :src="item.img" mode="aspectFill"></image>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'activeParty',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				titleConfig: this.dataConfig.titleConfig.value,
-				desConfig: this.dataConfig.desConfig.value,
-				explosiveMoney: this.dataConfig.menuConfig.list,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				bgColor: this.dataConfig.bgColor.color,
-				mbConfig: this.dataConfig.mbConfig.val,
-				boxColor: this.dataConfig.boxColor.color[0].item
-			};
-		},
-		created() {},
-		methods: {
-			goDetail(item) {
-				let urls = item.info[2].value
-				if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
-					.indexOf(urls) == -1) {
-					uni.navigateTo({
-						url: urls
-					})
-				} else {
-					uni.switchTab({
-						url: urls
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.explosion {
-		width: 710rpx;
-		margin-top: 20rpx;
-		margin: 20rpx auto 0 auto;
-		padding: 30rpx 20rpx;
-		padding: 30rpx 20rpx 6rpx 20rpx;
-		background-color: #FFE5E3;
-		background-size: 100% 100%;
-		border-radius: 13px;
-		box-sizing: border-box;
-
-		.hd {
-			display: flex;
-			align-items: center;
-
-			.title {
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-right: 12rpx;
-			}
-
-			image {
-				width: 147rpx;
-				height: 35rpx;
-				margin-right: 20rpx;
-			}
-
-			.txt {
-				padding: 0 10rpx;
-				height: 36rpx;
-				// background: linear-gradient(90deg, rgba(255, 168, 0, 1) 0%, rgba(255, 34, 15, 1) 100%);
-				border-radius: 26rpx 0px 26rpx 0px;
-				color: #fff;
-				text-align: center;
-				font-size: 22rpx;
-				box-shadow: 3px 1px 1px 1px var(--view-minorColorT);
-			}
-		}
-
-		.bd {
-			display: flex;
-			flex-wrap: wrap;
-			margin-top: 28rpx;
-
-			.item {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				position: relative;
-				width: 325rpx;
-				height: 180rpx;
-				margin-bottom: 20rpx;
-				margin-right: 20rpx;
-				background-color: #fff;
-				border-radius: 16rpx;
-				padding: 0 20rpx;
-				box-sizing: border-box;
-
-				image {
-					width: 140rpx;
-					height: 140rpx;
-				}
-
-				.con-box {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					width: 130rpx;
-					height: 100%;
-
-					.title {
-						color: #282828;
-						font-size: 28rpx;
-					}
-
-					.con {
-						color: #999999;
-						font-size: 20rpx;
-						margin-top: 2rpx;
-					}
-
-					.go {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-top: 10rpx;
-						width: 112rpx;
-						height: 36rpx;
-						border-radius: 18rpx;
-						color: #fff;
-						font-size: 26rpx;
-						font-weight: bold;
-						font-style: italic;
-
-						image {
-							width: 26rpx;
-							height: 26rpx;
-						}
-					}
-				}
-
-				&:first-child .go {
-					background: linear-gradient(90deg, rgba(75, 196, 255, 1) 0%, rgba(32, 126, 255, 1) 100%);
-				}
-
-				&:nth-child(2) .go {
-					background: linear-gradient(90deg, rgba(255, 144, 67, 1) 0%, rgba(255, 83, 29, 1) 100%);
-				}
-
-				&:nth-child(3) .go {
-					background: linear-gradient(90deg, rgba(150, 225, 135, 1) 0%, rgba(72, 206, 44, 1) 100%);
-				}
-
-				&:nth-child(4) .go {
-					background: linear-gradient(90deg, rgba(255, 197, 96, 1) 0%, rgba(255, 156, 0, 1) 100%);
-				}
-
-				&:nth-child(2n) {
-					margin-right: 0;
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/bargain.vue

@@ -1,186 +0,0 @@
-<template>
-	<view v-show="!isSortType" :style="{padding:'0 '+prConfig*2+'rpx'}">
-		<view class="barg" :class="bgStyle===0?'':'borderRadius15'" :style="'background: linear-gradient(180deg, '+ bgColor[0].item +' 0%, '+ bgColor[1].item +' 100%);margin-top:' + mbCongfig*2 +'rpx;'" v-if="bargList.length>0">
-				<view class="title" :style="'color:'+titleColor+';'">
-					{{$t(`砍价专区·BARGAINING`)}}
-					<!-- <image src="/static/images/barg001.png" mode=""></image> -->
-				</view>
-				<view class="barg-swiper">
-					<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="true">
-						<view class="wrapper">
-							<block v-for="(item,index) in bargList" :key="index">
-								<view class='list-box' :style="'margin-right:'+productGap*2+'rpx;'" @click="bargDetail(item)">
-									<image :src="item.image" mode="aspectFill" class="slide-image"></image>
-									<view class="info-txt" v-if="priceShow||bntShow">
-										<view v-if="priceShow" class="price" :style="'color:'+themeColor+';'"><text>{{$t(`￥`)}}</text>{{item.price}}</view>
-										<view v-if="bntShow" class="txt" :style="'background-color:'+ themeColor +';'">{{$t(`立即砍价`)}}</view>
-									</view>
-								</view>
-							</block>
-							<navigator url="/pages/activity/goods_bargain/index" class="more-box" hover-class="none">
-								<view class="txt">{{$t(`查看更多`)}}</view>
-								<image src="/static/images/mores.png"></image>
-							</navigator>
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getBargainList
-	} from '@/api/activity.js';
-	export default {
-		name: 'bargain',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				bargList: [],
-				numConfig: this.dataConfig.numConfig.val,//显示砍价列表数量
-				themeColor: this.dataConfig.themeColor.color[0].item,//主题颜色
-				titleColor: this.dataConfig.titleColor.color[0].item,//标题颜色
-				bgColor: this.dataConfig.bgColor.color,//背景颜色
-				mbCongfig: this.dataConfig.mbCongfig.val,
-				productGap: this.dataConfig.productGap.val,
-				priceShow: this.dataConfig.priceShow.val, //是否显示价格
-				bntShow: this.dataConfig.bntShow.val, //是否显示按钮
-				bgStyle: this.dataConfig.bgStyle.val,//设置背景样式
-				prConfig: this.dataConfig.prConfig.val//设置背景边距
-			};
-		},
-		created() {},
-		mounted() {
-			this.getBargainList();
-		},
-		methods: {
-			// 砍价列表
-			getBargainList() {
-				let limit = this.$config.LIMIT;
-				getBargainList({
-					page: 1,
-					limit: this.numConfig>=limit?limit:this.numConfig
-				}).then(res => {
-					this.bargList = res.data
-				})
-			},
-			bargDetail(item){
-			    this.$emit('changeBarg', item);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.barg {
-		padding-bottom: 32rpx;
-		padding-left: 20rpx;
-		background:linear-gradient(180deg,rgba(253,219,178,1) 0%,rgba(253,239,198,1) 100%);
-		background-size: 100% 100%;
-		box-sizing: border-box;
-		
-		.title {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding-top: 42rpx;
-			font-size: 38rpx;
-			color: #FF6000;
-			font-weight: bold;
-	
-			image {
-				width: 463rpx;
-				height: 39rpx;
-			}
-		}
-	
-		.barg-swiper {
-			margin-top: 43rpx;
-			padding-right: 20rpx;
-	
-			.wrapper {
-				display: flex;
-			}
-	
-			.list-box {
-				flex-shrink: 0;
-				width: 210rpx;
-				background-color: #fff;
-				border-radius: 16rpx;
-				overflow: hidden;
-				margin-right: 20rpx;
-	
-				image {
-					width: 100%;
-					height: 210rpx;
-				}
-	
-				.info-txt {
-					width: 100%;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					padding-top: 4rpx;
-					padding-bottom: 18rpx;
-	
-					.price {
-						font-weight: 700;
-						color: $theme-color;
-						font-size: 28rpx;
-						text{
-							font-size: 18rpx;
-						}
-					}
-	
-					.txt {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 136rpx;
-						height: 33rpx;
-						margin-top: 10rpx;
-						border-radius: 17px;
-						font-size: 18rpx;
-						color: #fff;
-	
-					}
-				}
-			}
-	
-			.more-box {
-				flex-shrink: 0;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				width: 80rpx;
-				background-color: #fff;
-				border-radius: 16rpx;
-	
-				image {
-					width: 24rpx;
-					height: 24rpx;
-					margin-top: 10rpx;
-				}
-	
-				.txt {
-					display: block;
-					writing-mode: vertical-lr;
-					font-size: 26rpx;
-					line-height: 1.2;
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/blankPage.vue

@@ -1,44 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<view class="blankPage" :style="'height:'+ heightConfig*2 +'rpx;'" v-if="heightConfig>0">
-			<view class="bankCon" :style="'background-color:'+ bgColor +';'"></view>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		name: 'blankPage',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				bgColor:this.dataConfig.bgColor.color[0].item,
-				heightConfig:this.dataConfig.heightConfig.val
-			};
-		},
-		created() {},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.blankPage{
-		.bankCon{
-			width: 100%;
-			height: 100%;
-			background-color: blue;
-		}
-	} 
-</style>

pages/index/diy/components/combination.vue

@@ -1,262 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<view class="group-wrapper" :class="conStyle?'borderRadius20':''" :style="'background:'+bgColor+';margin:0 '+prConfig*2+'rpx;margin-top:'+ mbConfig*2 +'rpx;'" v-if="combinationList.length>0">
-			<view class="hd">
-				<view class="left">
-					<image :src="imgUrl" mode=""v-if="imgUrl" class="icon"></image>
-					<!-- <image src="/static/images/group02.gif" class="icon" v-else></image> -->
-					
-					<view class="name">{{$t(`拼团活动`)}}</view>
-					<!-- <image src="/static/images/group01.png" class="title"></image> -->
-					<view class="person">
-						<view class="avatar-box">
-							<block v-for="(item,index) in pinkInfo.avatars" :key="index">
-								<image :src="item" mode=""></image>
-							</block>
-						</view>
-						<view class="num" v-if="pinkInfo.pink_count>0">{{pinkInfo.pink_count}} {{$t(`人拼团成功.`)}}</view>
-					</view>
-				</view>
-				<navigator class="more" url="/pages/activity/goods_combination/index" hover-class="none">{{$t(`更多`)}} <text class="iconfont icon-jiantou"></text></navigator>
-			</view>
-			<view class="group-scroll">
-				<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-					<navigator class="group-item" :style="'margin-right:'+ lrConfig*2 +'rpx;'" v-for="(item,index) in combinationList" :key="index"
-					 :url="'/pages/activity/goods_combination_details/index?id='+item.id" hover-class="none">
-						<image :src="item.image" mode="aspectFill"></image>
-						<view class="people" v-if="joinShow">{{item.people}}{{$t(`人团`)}}</view>
-						<view class="info">
-							<view class="name line1" v-if="titleShow">{{item.title}}</view>
-							<view class="price-box">
-								<!-- <text v-if="pinkShow" class="tips" :style="'background-color:'+txtColor+';color:'+themeColor+';'">{{$t(`拼团价`)}}</text> -->
-								<text v-if="priceShow" class="price" :style="'color:'+themeColor+';'"><text>{{$t(`￥`)}}</text>{{item.price}}</text>
-							</view>
-						</view>
-						<view v-if="bntShow" class="bom-btn" :style="'background-color:'+themeColor+';'">{{$t(`参与拼团`)}}</view>
-					</navigator>
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		pink
-	} from '@/api/api.js';
-	import {
-		getCombinationList
-	} from '@/api/activity.js';
-	export default {
-		name: 'combination',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				pinkInfo: '',
-				combinationList: [],
-				numConfig:this.dataConfig.numConfig.val,
-				txtColor:this.dataConfig.txtColor.color[0].item,
-				themeColor:this.dataConfig.themeColor.color[0].item,
-				mbConfig:this.dataConfig.mbConfig.val,
-				lrConfig:this.dataConfig.lrConfig.val,
-				imgUrl:this.dataConfig.imgConfig.url,
-				priceShow:this.dataConfig.priceShow.val,//是否显示价格
-				bntShow:this.dataConfig.bntShow.val,//是否显示按钮
-				titleShow:this.dataConfig.titleShow.val,//是否显示标题
-				pinkShow:this.dataConfig.pinkShow.val,//是否显示拼团标签
-				joinShow:this.dataConfig.joinShow.val,//是否显示参团标签
-				prConfig:this.dataConfig.prConfig.val,
-				bgColor:this.dataConfig.bgColor.color[0].item,
-				conStyle:this.dataConfig.conStyle.type
-			};
-		},
-		created() {
-		},
-		mounted() {
-			this.pink();
-			this.getCombinationList();
-		},
-		methods: {
-			// 拼团列表
-			getCombinationList: function() {
-				let that = this;
-				let limit = that.$config.LIMIT;
-				let data = {
-					page: 1,
-					limit: that.numConfig>=limit?limit:that.numConfig
-				};
-				getCombinationList(data).then(function(res) {
-					that.combinationList = res.data;
-				}).catch((res) => {
-					return that.$util.Tips({
-						title: res
-					});
-				})
-			},
-			// 拼团数据（拼团人数头部图片）
-			pink: function() {
-				pink().then(res => {
-					this.pinkInfo = res.data
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.group-wrapper {
-		padding: 20rpx 20rpx 26rpx 20rpx;
-		background: #fff;
-
-		.hd {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.left {
-				display: flex;
-				align-items: center;
-				.name{
-					font-size: 32rpx;
-					font-weight: 600;
-				}
-
-				.icon {
-					width: 36rpx;
-					height: 36rpx;
-					margin-right: 12rpx;
-				}
-
-				.title {
-					width: 134rpx;
-					height: 33rpx;
-				}
-
-				.person {
-					display: flex;
-					align-items: center;
-					margin-left: 40rpx;
-
-					.avatar-box {
-						display: flex;
-						align-items: center;
-
-						image {
-							width: 30rpx;
-							height: 30rpx;
-							border-radius: 50%;
-							margin-right: -10rpx;
-						}
-					}
-
-					.num {
-						margin-left: 18rpx;
-						font-size: 26rpx;
-						color: #999999;
-					}
-				}
-			}
-
-			.more {
-				font-size: 26rpx;
-				color: #999;
-
-				.iconfont {
-					margin-left: 6rpx;
-					font-size: 25rpx;
-				}
-			}
-		}
-
-		.group-scroll {
-			width: 100%;
-			margin-top: 25rpx;
-
-			.group-item {
-				display: inline-block;
-				width: 220rpx;
-				box-shadow: 0px 2px 6px 2px rgba(0, 0, 0, 0.03);
-				border-radius: 16rpx;
-				position: relative;
-				background-color: #fff;
-
-				.people {
-					position: absolute;
-					width: 140rpx;
-					height: 32rpx;
-					background: rgba(0, 0, 0, 0.1);
-					box-shadow: 2rpx 2rpx 8rpx 0 rgba(0, 0, 0, 0.06);
-					border-radius: 16rpx;
-					top: 12rpx;
-					left: 12rpx;
-					font-size: 20rpx;
-					color: #fff;
-					text-align: center;
-					line-height: 32rpx;
-				}
-
-				image {
-					width: 100%;
-					height: 220rpx;
-					border-radius: 16rpx 16rpx 0 0;
-				}
-
-				.info {
-					padding: 2rpx 12rpx 10rpx 12rpx;
-
-					.name {
-						font-size: 24rpx;
-					}
-
-					.price-box {
-						display: flex;
-						align-items: center;
-						margin-top: 6rpx;
-
-						.tips {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 76rpx;
-							height: 30rpx;
-							margin-right: 6rpx;
-							border-radius: 2px;
-							font-size: 18rpx;
-						}
-
-						.price {
-							font-size: 28rpx;
-							font-weight: 700;
-
-							text {
-								font-size: 18rpx;
-							}
-						}
-					}
-
-				}
-
-				.bom-btn {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 100%;
-					height: 48rpx;
-					border-radius: 0px 0px 16rpx 16rpx;
-					color: #fff;
-					font-size: 24rpx;
-
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/coupon.vue

@@ -1,255 +0,0 @@
-<template>
-	<view v-show="!isSortType" :style="{padding:'0 '+prConfig*2+'rpx'}">
-		<view class="coupon" :class="bgStyle===0?'':'borderRadius15'" :style="'background-color:'+bgColor+';margin-top:' + mbConfig*2 +'rpx;'" v-if="couponList.length">
-			<scroll-view scroll-x="true" style="white-space: nowrap; vertical-align: middle;" show-scrollbar="false">
-		
-				<view class="wrapper">
-				
-				<view class="item" :style="item.is_use?'':'background-color:'+ themeColor +';'" style="margin-right: 20rpx;" v-for="(item,index) in couponList"
-				 :key="index" hover-class="none">
-					<view class="itemCon acea-row row-between-wrapper">
-						<view class="text">
-							<view class="money"><text>{{$t(`$`)}}</text>{{item.coupon_price}}</view>
-							<view class="info">{{$t(`满`)}}{{item.use_min_price}}{{$t(`元可用`)}}</view>
-						</view>
-						<view class="bnt" v-if="item.is_use===true"><text>{{$t(`已领取`)}}</text></view>
-						<view class="bnt" v-else-if="item.is_use===false" @click="receiveCoupon(item)"><text>{{$t(`立即领取`)}}</text></view>
-						<view class="bnt" v-else-if="item.is_use===2"><text>{{$t(`已过期`)}}</text></view>
-					</view>
-					<view class="roll up-roll" :style="{background:bgColor}"></view>
-					<view class="roll down-roll" :style="{background:bgColor}"></view>
-				</view>
-				<navigator url="/pages/users/user_get_coupon/index" class="more-box" hover-class="none">
-					<view class="txt">{{$t(`更多`)}}</view>
-					<image src="/static/images/mores.png"></image>
-				</navigator>
-				</view>	
-			</scroll-view>
-			<!-- #ifdef MP -->
-			<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize> -->
-			<!-- #endif -->
-		</view>
-	</view>
-	
-</template>
-
-<script>
-	import {
-		getCoupons,
-		setCouponReceive
-	} from '@/api/api.js';
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	export default {
-		name: 'coupon',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		computed: mapGetters(['isLogin']),
-		components: {
-			// #ifdef MP
-			authorize
-			// #endif
-		},
-		watch:{
-			isLogin:{
-				handler:function(newV,oldV){
-					if(newV){
-						this.getCoupon();
-					}
-				},
-				deep:true
-			}
-		},
-		data() {
-			return {
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				couponList: [],
-				bgColor: this.dataConfig.bgColor.color[0].item,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				mbConfig: this.dataConfig.mbConfig.val,
-				bgStyle: this.dataConfig.bgStyle.type,
-				prConfig: this.dataConfig.prConfig.val
-			};
-		},
-		created() {},
-		mounted() {
-			this.getCoupon();
-		},
-		methods: {
-			getCoupon: function() {
-				let that = this;
-				let limit = that.$config.LIMIT;
-				getCoupons({
-					page: 1,
-					limit: limit,
-					type: -1
-				}).then(res => {
-					that.$set(that, 'couponList', res.data.list);
-				}).catch(err => {
-					return that.$util.Tips({
-						title: err
-					});
-				});
-			},
-			receiveCoupon: function(item) {
-				let that = this;
-				if (!that.isLogin) {
-					toLogin();
-				} else {
-					setCouponReceive(item.id)
-						.then(function() {
-							item.is_use = true;
-							that.$set(that, 'couponList', that.couponList);
-							that.$util.Tips({
-								title: that.$t(`领取成功`)
-							});
-						})
-						.catch(function(err) {
-							that.$util.Tips({
-								title: err
-							});
-						});
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.coupon {
-		background-color: #fff;
-		padding: 20rpx;
-
-		.item {
-			display: flex;
-			width: 304rpx;
-			height: 122rpx;
-			background-color: #DDDDDD;
-			border-radius: 8rpx;
-			color: #fff;
-			position: relative;
-			display: inline-block;
-			flex-shrink: 0;
-			.roll{
-				position: absolute;
-				width: 20rpx;
-				height: 20rpx;
-				border-radius: 50%;
-				background: #fff;
-				&.up-roll{
-					right: 52rpx;
-					top: -10rpx;
-				}
-				&.down-roll{
-					right: 52rpx;
-					bottom: -10rpx;
-				}
-			}
-			// &::before {
-			// 	position: absolute;
-			// 	content: ' ';
-			// 	width: 20rpx;
-			// 	height: 20rpx;
-			// 	border-radius: 50%;
-			// 	background-color: #fff;
-			// 	right: 52rpx;
-			// 	top: -10rpx;
-			// }
-
-			// &::after {
-			// 	position: absolute;
-			// 	content: ' ';
-			// 	width: 20rpx;
-			// 	height: 20rpx;
-			// 	border-radius: 50%;
-			// 	background-color: #fff;
-			// 	right: 52rpx;
-			// 	bottom: -10rpx;
-			// }
-
-			.itemCon {
-				height: 100%;
-				width: 100%;
-
-				.text {
-					width: 240rpx;
-
-					.money {
-						font-size: 48rpx;
-						text-align: center;
-
-						text {
-							font-size: 24rpx;
-						}
-					}
-
-					.info {
-						font-size: 24rpx;
-						text-align: center;
-					}
-				}
-
-				.bnt {
-					position: relative;
-					height: 100%;
-					font-size: 20rpx;
-					display: block;
-					writing-mode: vertical-lr;
-					line-height: 1.2;
-					width: 64rpx;
-					border-left: 1px dashed #fff;
-					text{
-						position: absolute;
-						left: 56%;
-						top: 50%;
-						transform: translate(-50%,-50%);
-					}
-				}
-			}
-		}
-
-		.wrapper {
-			display: flex;
-		}
-
-		.more-box {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 10px;
-			height: 122rpx;
-			image {
-				width: 20rpx;
-				height: 20rpx;
-				margin-top: 10rpx;
-				margin: 10rpx 0 0 5rpx;
-			}
-
-			.txt {
-				display: block;
-				writing-mode: vertical-lr;
-				font-size: 20rpx;
-				line-height: 1.2;
-			}
-		}
-	}
-</style>

pages/index/diy/components/customerService.vue

@@ -1,75 +0,0 @@
-<template>
-	<view style="touch-action: none;" v-show="!isSortType">
-		<!-- #ifdef H5 || APP-PLUS -->
-		<view class="customerService" :style="'top:'+topConfig" @touchmove.stop.prevent="setTouchMove">
-			<navigator class="pictrue" url="/pages/extension/customer_list/chat" hover-class="none">
-				<image :src="logoConfig"></image>
-			</navigator>
-		</view>
-		<!-- #endif -->
-		<!-- #ifdef MP -->
-		<view class="customerService" :style="'top:'+topConfig" @touchmove.stop.prevent="setTouchMove" v-if="routineContact === '0'">
-			<navigator class="pictrue" url="/pages/extension/customer_list/chat" hover-class="none">
-				<image :src="logoConfig"></image>
-			</navigator>
-		</view>
-		<button class="customerService-sty" :style="'top:'+topConfig" @touchmove.stop.prevent="setTouchMove" open-type='contact' v-if="routineContact === '1'">
-			<image class="pictrue" :src="logoConfig"></image>
-		</button>
-		<!-- #endif -->
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'customerService',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				routineContact: this.dataConfig.routine_contact_type,
-				logoConfig: this.dataConfig.logoConfig.url,
-				topConfig: this.dataConfig.topConfig.val?this.dataConfig.topConfig.val+'%':'30%'
-			};
-		},
-		created() {},
-		methods: {
-			setTouchMove(e) {
-				var that = this;
-				if (e.touches[0].clientY < 545 && e.touches[0].clientY > 66) {
-					that.topConfig = e.touches[0].clientY+'px'
-				}
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.customerService,.customerService-sty {
-		position: fixed;
-		right: 20rpx;
-		z-index: 40;
-		.pictrue {
-			width: 86rpx;
-			height: 86rpx;
-			
-			border-radius: 50%;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-	.customerService-sty{
-		background-color: rgba(0,0,0,0) !important;
-	}
-</style>

pages/index/diy/components/goodList.vue

@@ -1,414 +0,0 @@
-<template>
-	<view v-show="!isSortType" :style="{padding:'0 '+prConfig+'px'}">
-		<view class="index-product-wrapper" :class="bgStyle===0?'':'borderRadius15'"
-			:style="{ marginTop: mbConfig*2 + 'rpx', background: themeColor }" v-if="tempArr.length">
-			<!-- 单列 -->
-			<block v-if="itemStyle == 0">
-				<view class="list-box listA" :class="tempArr.length > 0 ? 'fadeIn on' : ''">
-					<view class="item" :class="conStyle?'borderRadius15':''" v-for="(item, index) in tempArr"
-						:key="index" @click="goDetail(item)">
-						<view class="pictrue">
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-							<image :src="item.image" mode="aspectFit"></image>
-						</view>
-						<view class="text-info"
-							style="display: flex; flex-direction: column; justify-content: space-between;">
-							<view>
-								<view class="title line2" v-if="titleShow">{{ item.store_name }}</view>
-								<view class="old-price" v-if="opriceShow">
-									<text>{{$t(`￥`)}}</text>
-									{{ item.ot_price }}
-								</view>
-							</view>
-							<view class="price" :style="'color:'+fontColor">
-								<view v-if="priceShow">
-									<text>{{$t(`￥`)}}</text>
-									{{ item.price }}
-								</view>
-								<view class="txt" :style="'border:1px solid '+labelColor+';color:'+labelColor"
-									:class="priceShow?'':'on'" v-if="item.checkCoupon && couponShow">{{$t(`券`)}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</block>
-			<!-- 两列 -->
-			<block v-if="itemStyle == 1">
-				<view class="list-box listC" :class="tempArr.length > 0 ? 'fadeIn on' : ''">
-					<view class="item" :class="conStyle?'borderRadius15':''" v-for="(item, index) in tempArr"
-						:key="index" @click="goDetail(item)">
-						<view class="pictrue">
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-							<image :src="item.image" mode="aspectFit">
-						</view>
-						<view class="text-info">
-							<view class="title line1" v-if="titleShow">{{ item.store_name }}</view>
-							<view class="old-price" v-if="opriceShow">
-								<text>{{$t(`￥`)}}</text>
-								{{ item.ot_price }}
-							</view>
-							<view class="price" :style="'color:'+fontColor">
-								<view v-if="priceShow">
-									<text>{{$t(`￥`)}}</text>
-									{{ item.price }}
-								</view>
-								<view class="txt" :style="'border:1px solid '+labelColor+';color:'+labelColor"
-									:class="priceShow?'':'on'" v-if="item.checkCoupon && couponShow">{{$t(`券`)}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</block>
-			<!-- 三列 -->
-			<block v-if="itemStyle == 2">
-				<view class="list-box listB" :class="tempArr.length > 0 ? 'fadeIn on' : ''">
-					<view class="item" :class="conStyle?'borderRadius15':''" v-for="(item, index) in tempArr"
-						:key="index" @click="goDetail(item)">
-						<view class="pictrue">
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-							<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor"
-								v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-							<image :src="item.image" mode="aspectFit"></image>
-						</view>
-						<view class="text-info"
-							style="display: flex; flex-direction: column; justify-content: space-between;">
-							<view>
-								<view class="title line1" v-if="titleShow">{{ item.store_name }}</view>
-								<view class="old-price" v-if="opriceShow">
-									<text>{{$t(`￥`)}}</text>
-									{{ item.ot_price }}
-								</view>
-							</view>
-							<view class="price" :style="'color:'+fontColor">
-								<view v-if="priceShow">
-									<text>{{$t(`￥`)}}</text>
-									{{ item.price }}
-								</view>
-								<view class="txt" :style="'border:1px solid '+labelColor+';color:'+labelColor"
-									:class="priceShow?'':'on'" v-if="item.checkCoupon && couponShow">{{$t(`券`)}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</block>
-		</view>
-		<!-- 大图 -->
-		<block v-if="itemStyle == 3 && tempArr.length" :style="{ marginTop: mbConfig + 'rpx' }">
-			<view class="listBig" :class="bgStyle===0?'':'borderRadius15'" :style="{ background: themeColor }">
-				<view class="itemBig" :class="conStyle?'borderRadius15':''" v-for="(item,index) in tempArr" :key="index"
-					@click="goDetail(item)">
-					<view class="img-box">
-						<span class="pictrue_log_big pictrue_log_class" :style="'background-color:'+labelColor"
-							v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-						<span class="pictrue_log_big pictrue_log_class" :style="'background-color:'+labelColor"
-							v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-						<span class="pictrue_log_big pictrue_log_class" :style="'background-color:'+labelColor"
-							v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-						<image :src="item.recommend_image" mode="aspectFill" v-if="item.recommend_image"></image>
-						<image :src="item.image" mode="widthFix" v-else></image>
-					</view>
-					<view class="name line2"><span class="coupon"
-							:style="'border:1px solid '+labelColor+';color:'+labelColor"
-							v-if="item.checkCoupon && couponShow">{{$t(`券`)}}</span><span
-							v-if="titleShow">{{item.store_name}}</span></view>
-					<view class="price" :style="'color:'+fontColor"><span v-if="priceShow">{{$t(`￥`)}}<span
-								class="num">{{item.price}}</span></span><span class="old-price"
-							v-if="opriceShow">{{$t(`￥`)}}{{item.ot_price}}</span></view>
-				</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-	import {
-		getProductslist
-	} from '@/api/store.js';
-	export default {
-		name: 'goodList',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				tempArr: [],
-				mbConfig: this.dataConfig.mbConfig.val,
-				numConfig: this.dataConfig.numConfig.val,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				itemStyle: this.dataConfig.itemStyle.type,
-				sortType: this.dataConfig.goodsSort.type,
-				type: this.dataConfig.tabConfig.tabVal || 0,
-				selectId: this.dataConfig.selectConfig.activeValue,
-				productIds: this.dataConfig.goodsList.ids || [],
-				opriceShow: this.dataConfig.opriceShow.val, //商品原价
-				priceShow: this.dataConfig.priceShow.val, //商品价格
-				titleShow: this.dataConfig.titleShow.val, //商品名称
-				couponShow: this.dataConfig.couponShow.val, //商品优惠券
-				prConfig: this.dataConfig.prConfig.val, //左右边距
-				bgStyle: this.dataConfig.bgStyle.type, //背景样式
-				conStyle: this.dataConfig.conStyle.type, //内容样式
-				fontColor: this.dataConfig.fontColor.color[0].item,
-				labelColor: this.dataConfig.labelColor.color[0].item
-			};
-		},
-		created() {},
-		mounted() {
-			this.productslist();
-		},
-		methods: {
-			productslist() {
-				let limit = this.$config.LIMIT;
-				let data = {};
-				if (this.type == 1) {
-					data = {
-						ids: this.productIds.join(','),
-					};
-				} else {
-					data = {
-						priceOrder: this.sortType == 2 ? 'desc' : '',
-						salesOrder: this.sortType == 1 ? 'desc' : '',
-						selectId: this.selectId[this.selectId.length - 1] || 0,
-						limit: this.numConfig
-					};
-				}
-				getProductslist(data).then(res => {
-					this.tempArr = res.data;
-				});
-			},
-			goDetail(item) {
-				this.$emit('detail', item);
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.listBig {
-		padding: 1px 20rpx 20rpx 20rpx;
-
-		.borderRadius15 {
-			image {
-				border-radius: 20rpx 20rpx 0 0;
-			}
-		}
-
-		.itemBig {
-			width: 100%;
-			margin-top: 20rpx;
-			background-color: #fff;
-			padding-bottom: 15rpx;
-
-			.img-box {
-				width: 100%;
-				height: 284rpx;
-				position: relative;
-
-				.pictrue_log_big {
-					border-radius: 20rpx 0 20rpx 0;
-				}
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.name {
-				font-size: 28rpx;
-				font-weight: bold;
-				margin-top: 16rpx;
-				padding: 0 8px;
-
-				.coupon {
-					display: inline-block;
-					text-align: center;
-					width: 32rpx;
-					border-radius: 4rpx;
-					font-size: 20rpx;
-					font-weight: normal;
-					margin-right: 10rpx;
-				}
-			}
-
-			.price {
-				font-weight: bold;
-				font-size: 12px;
-				margin-top: 10rpx;
-				padding: 0 8px;
-
-				.num {
-					font-size: 32rpx;
-					margin-right: 10rpx;
-				}
-
-				.old-price {
-					color: #aaa;
-					font-weight: normal;
-					text-decoration: line-through;
-				}
-			}
-		}
-	}
-
-	.index-product-wrapper {
-
-		.list-box {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			padding: 20rpx 20rpx 0;
-
-			.item {
-				width: 345rpx;
-				margin-bottom: 20rpx;
-				background-color: #fff;
-				overflow: hidden;
-				position: relative;
-
-				&.on {
-					border-radius: 0;
-				}
-
-				.pictrue {
-					width: 347rpx;
-					height: 347rpx;
-				}
-
-				.pictrue_log {
-					width: 92rpx;
-					height: 44rpx;
-					font-size: 26rpx;
-					line-height: 44rpx;
-					border-radius: 0 0 20rpx 0 !important;
-				}
-
-				image {
-					width: 100%;
-					// height: 346rpx;
-					height: 100%;
-					display: block;
-				}
-
-				.text-info {
-					padding: 10rpx 20rpx 15rpx;
-
-					.title {
-						color: #222222;
-					}
-
-					.old-price {
-						margin-top: 4rpx;
-						font-size: 26rpx;
-						color: #aaaaaa;
-						text-decoration: line-through;
-
-						text {
-							margin-right: 2px;
-							font-size: 20rpx;
-						}
-					}
-
-					.price {
-						display: flex;
-						align-items: flex-end;
-						font-size: 36rpx;
-						font-weight: 550;
-
-						text {
-							padding-bottom: 4rpx;
-							font-size: 26rpx;
-							font-weight: normal;
-						}
-
-						.txt {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 28rpx;
-							height: 28rpx;
-							margin-left: 15rpx;
-							margin-bottom: 10rpx;
-							border-radius: 4rpx;
-							font-size: 20rpx;
-							font-weight: normal;
-
-							&.on {
-								margin-left: 0;
-							}
-						}
-					}
-				}
-			}
-
-			&.on {
-				display: flex;
-			}
-
-			&.listA {
-				.item {
-					display: flex;
-					width: 100%;
-
-					.pictrue {
-						width: 220rpx;
-						height: 220rpx;
-					}
-
-					.text-info {
-						// width: 490rpx;
-						flex: 1
-					}
-				}
-			}
-
-			&.listC {
-				.item {
-					width: 48.5%;
-				}
-
-				.pictrue {
-					width: 100%;
-					height: 345rpx;
-				}
-			}
-
-			&.listB {
-				justify-content: inherit;
-
-				.item {
-					width: 31.6%;
-					margin-right: 16rpx;
-
-					.pictrue {
-						width: 100%;
-						height: 220rpx;
-					}
-
-					&:nth-child(3n) {
-						margin-right: 0;
-					}
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/liveBroadcast.vue

@@ -1,509 +0,0 @@
-<template>
-	<!-- #ifdef MP -->
-	<view v-show="!isSortType">
-		<view :style="[{'margin-top': mbConfig + 'rpx'},{'background':bg}]" v-if="liveList.length > 0" style="padding-bottom: 20rpx;">
-			<view class="title-box">
-				<text>{{$t(`推荐好货`)}}</text>
-				<navigator hover-class="none" url="/pages/columnGoods/live_list/index" class="more">{{$t(`更多`)}}<text class="iconfont icon-jiantou"></text></navigator>
-			</view>
-			<!--  -->
-			<block v-if="listStyle == 0">
-				<view class="live-wrapper-a">
-					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
-						<view class="img-box">
-							<view class="label bgblue" v-if="item.live_status == 102">
-								<view class="txt">{{$t(`预告`)}}</view>
-								<view class="msg">{{item.show_time}}</view>
-							</view>
-							<view class="label bggary" v-if="item.live_status==103">
-								<image src="/static/images/live-02.png" mode="" style="width: 20rpx; height: 20rpx;"></image>
-								<text>{{$t(`回放`)}}</text>
-							</view>
-							<view class="label bgred" v-if="item.live_status==101">
-								<image src="/static/images/live-01.png" mode="" style="width: 21rpx; height: 22rpx;"></image>
-								<text>{{$t(`进行中`)}}</text>
-							</view>
-							<image :src="item.share_img"></image>
-						</view>
-						<view class="info">
-							<view class="title line2">{{item.name}}</view>
-							<view class="people">
-								<image :src="item.anchor_img" alt="">
-								<text>{{item.anchor_name}}</text>
-							</view>
-							<view class="goods-wrapper">
-								<block v-if="item.goods.length <= 3">
-									<view class="goods-item" v-for="(goods,index) in item.goods" :key="index">
-										<image :src="goods.cover_img" alt="">
-										<text class="line1">{{$t(`￥`)}}{{goods.price}}</text>
-									</view>
-								</block>
-								<block v-if=" item.goods.length > 3">
-									<view class="goods-item" v-for="(goods,index) in item.goods" :key="index" v-if="index<2">
-										<image :src="goods.cover_img" alt="">
-										<text class="line1">{{$t(`￥`)}}{{goods.price}}</text>
-									</view>
-									<view class="goods-item">
-										<image :src="item.goods[item.goods.length-1].cover_img" alt="">
-										<view class="num">+{{item.goods.length}}</view>	
-									</view>
-								</block>
-								<block v-if="item.goods.length == 0">
-									<view class="empty-goods" >{{$t(`暂无商品`)}}</view>
-								</block>
-							</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-			<block v-if="listStyle == 1">
-				<view class="live-wrapper-b">
-					<navigator class="live-item-b" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
-						<view class="img-box">
-							<view class="label bgblue" v-if="item.live_status == 102">
-								<view class="txt">{{$t(`预告`)}}</view>
-								<view class="msg">{{item.show_time}}</view>
-							</view>
-							<view class="label bggary" v-if="item.live_status==103">
-								<image src="/static/images/live-02.png" mode="" style="width: 20rpx; height: 20rpx;"></image>
-								<text>{{$t(`回放`)}}</text>
-							</view>
-							<view class="label bgred" v-if="item.live_status==101">
-								<image src="/static/images/live-01.png" mode="" style="width: 21rpx; height: 22rpx;"></image>
-								<text>{{$t(`进行中`)}}</text>
-							</view>
-							<image :src="item.share_img"></image>
-						</view>
-						<view class="info">
-							<view class="title line2">{{item.name}}</view>
-							<view class="people">
-								<image :src="item.anchor_img" alt="">
-								<text>{{item.anchor_name}}</text>
-							</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-			<block v-if="listStyle == 2">
-				<view class="live-wrapper-a live-wrapper-c">
-					<navigator class="live-item-a" v-for="(item,index) in liveList" :key="index" :url="'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.room_id+'&custom_params='+custom_params" hover-class="none" :style="[{'box-shadow':`0px 1px 20px ${boxShadow}`}]">
-						<view class="img-box">
-							<view class="label bgblue" v-if="item.live_status == 102">
-								<view class="txt">{{$t(`预告`)}}</view>
-								<view class="msg">{{item.show_time}}</view>
-							</view>  
-							<view class="label bggary" v-if="item.live_status==103">
-								<image src="/static/images/live-02.png" mode="" style="width: 20rpx; height: 20rpx;"></image>
-								<text>{{$t(`回放`)}}</text>
-							</view>
-							<view class="label bgred" v-if="item.live_status==101">
-								<image src="/static/images/live-01.png" mode="" style="width: 21rpx; height: 22rpx;"></image>
-								<text>{{$t(`进行中`)}}</text>
-							</view>
-							<image :src="item.share_img"></image>
-						</view>
-						<view class="info">
-							<view class="left">
-								<view class="title line2">{{item.name}}</view>
-								<view class="people">
-									<image :src="item.anchor_img" alt="">
-									<text>{{item.anchor_name}}</text>
-								</view>
-							</view>
-							<view class="goods-wrapper">
-								<block v-if="item.goods.length <= 2">
-									<view class="goods-item" v-for="(goods,index) in item.goods" :key="index">
-										<image :src="goods.cover_img" alt="">
-										<text class="line1">{{$t(`￥`)}}{{goods.price}}</text>
-									</view>
-								</block>
-								<block v-if=" item.goods.length > 2">
-									<view class="goods-item" v-for="(goods,index) in item.goods" :key="index" v-if="index<1">
-										<image :src="goods.cover_img" alt="">
-										<text class="line1">{{$t(`￥`)}}{{goods.price}}</text>
-									</view>
-									<view class="goods-item">
-										<image :src="item.goods[item.goods.length-1].cover_img" alt="">
-										<view class="num">+{{item.goods.length}}</view>	
-									</view>
-								</block>
-							</view>
-						</view>
-					</navigator>
-				</view>
-			</block>
-		</view>
-		
-	</view>
-	<!-- #endif -->
-</template>
-
-<script>
-	import {
-		getLiveList
-	} from '@/api/api.js';
-	export default {
-		name: 'liveBroadcast',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				// endBg: this.dataConfig.endBg.color[0].item,
-				// notBg: this.dataConfig.notBg.color[0].item,
-				// playBg: this.dataConfig.playBg.color[0].item,
-				listStyle: this.dataConfig.listStyle.type,
-				mbConfig: this.dataConfig.mbConfig.val,
-				liveList: [],
-				custom_params:''
-				// bg:this.dataConfig.bg.color[0].item,
-				// boxShadow: this.dataConfig.boxShadow.color[0].item,
-				// limit:this.dataConfig.limit.val
-			};
-		},
-		created() {},
-		mounted() {
-			this.custom_params= encodeURIComponent(JSON.stringify({spid:this.$store.state.app.uid}))
-			this.getLiveList();
-		},
-		methods: {
-			// 
-			getLiveList: function() {
-				let limit = this.$config.LIMIT;
-				getLiveList(1, this.limit == undefined ? 10 : this.limit)
-					.then(res => {
-						this.liveList = res.data;
-					})
-					.catch(res => {
-					});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.live-wrapper {
-		position: relative;
-		width: 100%;
-		overflow: hidden;
-		border-radius: 16rpx;
-
-		image {
-			width: 100%;
-			height: 400rpx;
-		}
-
-		.live-top {
-			z-index: 20;
-			position: absolute;
-			left: 0;
-			top: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			color: #fff;
-			width: 180rpx;
-			height: 54rpx;
-			border-radius: 0rpx 0px 18rpx 0px;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-				margin-right: 10rpx;
-				/* #ifdef H5 */
-				display: block;
-				/* #endif */
-			}
-		}
-
-		.live-title {
-			position: absolute;
-			left: 0;
-			bottom: 6rpx;
-			width: 100%;
-			height: 70rpx;
-			line-height: 70rpx;
-			text-align: center;
-			font-size: 30rpx;
-			color: #fff;
-			background: rgba(0, 0, 0, 0.35);
-		}
-
-		&.mores {
-			width: 100%;
-
-			.item {
-				position: relative;
-				width: 320rpx;
-				display: inline-block;
-				border-radius: 16rpx;
-				overflow: hidden;
-				margin-right: 20rpx;
-
-				image {
-					width: 320rpx;
-					height: 180rpx;
-					border-radius: 16rpx;
-				}
-
-				.live-title {
-					height: 40rpx;
-					line-height: 40rpx;
-					text-align: center;
-					font-size: 22rpx;
-				}
-
-				.live-top {
-					width: 120rpx;
-					height: 36rpx;
-					font-size: 22rpx;
-
-					image {
-						width: 20rpx;
-						height: 20rpx;
-					}
-				}
-			}
-		}
-	}
-	.live-wrapper-a{
-		padding: 0rpx 20rpx 0;
-		.live-item-a{
-			display: flex;
-			background: #fff;
-			margin-bottom: 20rpx;
-			border-radius: 16rpx;
-			overflow: hidden;
-			&:last-child{
-				margin-bottom: 0;
-			}
-			.img-box{
-				position: relative;
-				width: 340rpx;
-				height: 270rpx;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-			.info{
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				padding: 15rpx 20rpx;
-				.title{
-					font-size: 30rpx;
-					color: #333;
-				}
-				.people{
-					display: flex;
-					align-items: center;
-					color: #999;
-					font-size: 24rpx;
-					margin-top: 10rpx;
-					image{
-						width: 32rpx;
-						height: 32rpx;
-						border-radius: 50%;
-						margin-right: 10rpx;
-					}
-				}
-				.goods-wrapper{
-					display: flex;
-					.goods-item{
-						position: relative;
-						width: 96rpx;
-						height: 96rpx;
-						margin-right: 20rpx;
-						overflow: hidden;
-						border-radius: 16rpx;
-						&:last-child{
-							margin-right: 0;
-						}
-						image{
-							width: 100%;
-							height: 100%;
-							border-radius: 16rpx;
-						}
-						.bg{
-							position: absolute;
-							left: 0;
-							top: 0;
-							width: 100%;
-							height: 100%;
-							border-radius: 16rpx;
-							background: rgba(0, 0, 0, 0.3);
-						}
-						text{
-							position: absolute;
-							left: 0;
-							bottom: 0;
-							width: 100%;
-							height: 60rpx;
-							line-height: 70rpx;
-							color: #fff;
-							background: linear-gradient(180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.75) 100%);
-						}
-						.num{
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							position: absolute;
-							left: 0;
-							top: 0;
-							width: 100%;
-							height: 100%;
-							background: rgba(0, 0, 0, 0.3);
-							color: #fff;
-							font-size: 28rpx;
-						}
-					}
-				}
-				.empty-goods{
-					width: 96rpx;
-					height: 96rpx;
-					border-radius: 6rpx;
-					background-color: #B2B2B2;
-					color: #fff;
-					font-size: 20rpx;
-					text-align: center;
-					line-height: 96rpx;
-				}
-			}
-		}
-		&.live-wrapper-c{
-			.live-item-a{
-				display: flex;
-				flex-direction: column;
-				.img-box{
-					width: 100%;
-					border-radius: 8px 8px 0 0;
-				}
-				.info{
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					flex-direction: initial;
-					.left{
-						width: 69%;
-					}
-					.goods-wrapper{
-						flex: 1;
-					}
-				}	
-			}
-		}
-	}
-	.live-wrapper-b{
-		padding: 0rpx 20rpx 0;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		.live-item-b{
-			width: 345rpx;
-			background-color: #fff;
-			border-radius: 16rpx;
-			overflow: hidden;
-			margin-bottom: 20rpx;
-			overflow: hidden;
-			.img-box{
-				position: relative;
-				image{
-					width: 100%;
-					height: 274rpx;
-				}
-			}
-			.info{
-				display: flex;
-				flex-direction: column;
-				padding: 20rpx;
-				.title{
-					font-size: 30rpx;
-					color: #333;
-				}
-				.people{
-					display: flex;
-					margin-top: 10rpx;
-					color: #999;
-					image{
-						width: 36rpx;
-						height: 36rpx;
-						border-radius: 50%;
-						margin-right: 10rpx;
-					}
-				}
-			}
-		}
-	}
-	.label{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		left: 20rpx;
-		top: 20rpx;
-		border-radius: 22rpx 0px 22rpx 22rpx;
-		font-size: 24rpx;
-		color: #fff;
-		image{
-			margin-right: 10rpx;
-		}
-		text{
-			font-size: 22rpx;
-		}
-	}
-	.bgred{
-		width: 132rpx;
-		height: 38rpx;
-		background: linear-gradient(270deg, #F5742F 0%, #FF1717 100%)
-	}
-	.bggary{
-		width: 108rpx;
-		height: 38rpx;
-		background: linear-gradient(270deg, #999999 0%, #666666 100%)
-	}
-	.bgblue{
-		width: 220rpx;
-		height: 38rpx;
-		background: rgba(0,0,0,0.36);
-		overflow: hidden;
-		.txt{
-				position: relative;
-				left: -5rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 38px;
-				height: 100%;
-				text-align: center;
-				background: linear-gradient(270deg, #2FA1F5 0%, #0076FF 100%);
-			}	
-		}
-	.title-box{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		font-size: 32rpx;
-		.more{
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			
-			font-size: 26rpx;
-			color: #666;
-			.iconfont{
-				font-size: 26rpx;
-				margin-top: 8rpx;
-			}
-		}
-	}
-</style>

pages/index/diy/components/pictureCube.vue

@@ -1,299 +0,0 @@
-<template>
-	<view class="pictureCube skeleton-rect" :class="{pageOn:bgStyle===1}" :style="{margin:'0 '+prConfig*2+'rpx',marginTop:slider*2+'rpx',background:bgColor}" v-if="picList.length" v-show="!isSortType">
-		<view class="advertItem01" v-for="(item,index) in picList" :key="index" v-if="style==0" @click="goDetail(item)">
-			<image :src="item.image" mode="widthFix"></image>
-		</view>
-		<view class="advertItem02 acea-row" v-if="style==1">
-			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill" :style="'height:'+ imageH +'rpx;'"></image>
-			</view>
-		</view>
-		<view class="advertItem02 advertItem03 acea-row" v-if="style==2">
-			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill" :style="'height:'+ imageH +'rpx;'"></image>
-			</view>
-		</view>
-		<view class="advertItem04 acea-row" v-if="style==3">
-			<view class="item" @click="goDetail(picList[0])">
-				<image :src="picList[0].image" mode="aspectFill"></image>
-			</view>
-			<view class="item">
-				<view class="pic"  @click="goDetail(picList[1])">
-					<image :src="picList[1].image" mode="aspectFill"></image>
-				</view>
-				<view class="pic"  @click="goDetail(picList[2])">
-					<image :src="picList[2].image" mode="aspectFill"></image>
-				</view>
-			</view>
-		</view>
-		<view class="advertItem02 advertItem05 acea-row" v-if="style==4">
-			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill" :style="'height:'+ imageH +'rpx;'"></image>
-			</view>
-		</view>
-		<view class="advertItem02 advertItem06 acea-row" v-if="style==5">
-			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill"></image>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'pictureCube',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				picList: this.dataConfig.picStyle.picList,
-				style: this.dataConfig.tabConfig.tabVal,
-				bgStyle: this.dataConfig.bgStyle.type,
-				prConfig: this.dataConfig.prConfig.val,
-				slider: this.dataConfig.mbConfig.val,
-				bgColor: this.dataConfig.bgColor.color[0].item,
-				widthC: '',
-				imageH: ''
-			};
-		},
-		mounted() {
-			if(this.picList.length){
-				let that = this;
-				this.$nextTick((e) => {
-					if(this.style==1){
-						this.widthC = 375
-					}else if(this.style==2){
-						this.widthC = 250
-					}else if(this.style==4){
-						this.widthC = 188
-					}
-					uni.getImageInfo({
-						src: that.setDomain(that.picList[0].image),
-						success: (res) => {
-							if (res && res.height > 0) {
-								let height = res.height * ((that.widthC-that.prConfig*2) / res.width)
-								that.$set(that, 'imageH', height);	
-							} else {
-								that.$set(that, 'imageH', (that.widthC-that.prConfig*2)*2);
-							}
-						},
-						fail: function(error) {
-							that.$set(that, 'imageH', (that.widthC-that.prConfig*2)*2);
-						}
-					})
-				})
-			}
-		},
-		created() {},
-		methods: {
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			goDetail(url) {
-				let urls = url.link
-				if (urls.indexOf("http") != -1) {
-					// #ifdef H5
-					location.href = urls
-					// #endif
-					// #ifdef MP || APP-PLUS
-					uni.navigateTo({
-						url: `/pages/annex/web_view/index?url=${urls}`
-					});
-					// #endif
-				} else {
-					if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
-						.indexOf(urls) == -1) {
-						uni.navigateTo({
-							url: urls
-						})
-					} else {
-						uni.reLaunch({
-							url: urls
-						})
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	 .pageOn{
-	        border-radius:24rpx!important;
-	        .advertItem01{
-	            image{
-	                border-radius:20rpx;
-	            }
-	        }
-	        .advertItem02{
-	            .item{
-	                &:nth-child(1){
-	                    image{
-	                        border-radius:20rpx 0 0 20rpx
-	                    }
-	                }
-	                &:nth-child(2){
-	                    image{
-	                        border-radius:0 20rpx 20rpx 0
-	                    }
-	                }
-	            }
-	        }
-	        .advertItem03{
-	            .item{
-	                &:nth-child(1){
-	                    image{
-	                        border-radius:20rpx 0 0 20rpx
-	                    }
-	                }
-	                &:nth-child(2){
-	                    image{
-	                        border-radius:0
-	                    }
-	                }
-	                &:nth-child(3){
-	                    image{
-	                        border-radius:0 20rpx 20rpx 0
-	                    }
-	                }
-	            }
-	        }
-	        .advertItem04{
-	            .item{
-	                &:nth-child(1){
-	                    image{
-	                        border-radius:20rpx 0 0 20rpx
-	                    }
-	                }
-	                &:nth-child(2){
-	                    .pic{
-	                        &:nth-child(1){
-	                            image{
-	                                border-radius:0 20rpx 0 0
-	                            }
-	                        }
-	                        &:nth-child(2){
-	                            image{
-	                                border-radius:0 0 20rpx 0
-	                            }
-	                        }
-	                    }
-	                }
-	            }
-	        }
-	        .advertItem05{
-	            .item{
-	                &:nth-child(1){
-	                    image{
-	                        border-radius:20rpx 0 0 20rpx
-	                    }
-	                }
-	                &:nth-child(2){
-	                    image{
-	                        border-radius:0
-	                    }
-	                }
-	                &:nth-child(4){
-	                    image{
-	                        border-radius:0 20rpx 20rpx 0
-	                    }
-	                }
-	            }
-	        }
-	        .advertItem06{
-	            .item{
-	                &:nth-child(1){
-	                    image{
-	                        border-radius:20rpx 0 0 0
-	                    }
-	                }
-	                &:nth-child(2){
-	                    image{
-	                        border-radius:0 20rpx 0 0
-	                    }
-	                }
-	                &:nth-child(3){
-	                    image{
-	                        border-radius:0 0 0 20rpx
-	                    }
-	                }
-	                &:nth-child(4){
-	                    image{
-	                        border-radius:0 0 20rpx 0
-	                    }
-	                }
-	            }
-	        }
-	    }
-	.pictureCube {
-		background-color: #fff;
-		.advertItem01 {
-			width: 100%;
-			height: auto;
-			image {
-				width: 100%;
-				height: 100%;
-				display: block;
-			}
-		}
-		.advertItem02{
-			// /deep/uni-image>img{
-			// 	position: unset;
-			// }
-			width: 100%;
-			.item{
-				width: 50%;
-				height: auto;
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-				}
-			}
-		}
-		.advertItem03{
-			.item{
-				width: 33.3333%;
-			}
-		}
-		.advertItem04{
-			width: 100%;
-			.item{
-				width: 50%;
-				height: 376rpx;
-				.pic{
-					width: 100%;
-					height: 188rpx;
-				}
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-				}
-			}
-		}
-		.advertItem05{
-			.item{
-				width: 25%;
-			}
-		}
-		.advertItem06{
-			.item{
-				width: 50%;
-				height: 188rpx;
-			}
-		}
-	}
-</style>

pages/index/diy/components/promotionList.vue

@@ -1,211 +0,0 @@
-<template>
-	<view class="index-product-wrapper" :class="iSshowH?'on':''" :style="'margin-top:'+mbConfig*2+'rpx;'" v-show="!isSortType">
-		<view class="nav-bd" :style="{justifyContent:titleConfig===0?'flex-start':titleConfig===1?'space-around':'flex-end'}">
-			<view class="item" v-for="(item,index) in explosiveMoney" :index="index" @click="ProductNavTab(item.link.activeVal,index)">
-				<view class="txt" :style="{ 'color': index==ProductNavindex ? themeColor : '' }">{{item.chiild[0].val}}</view>
-				<view class="label" :style="{ 'background': index==ProductNavindex ? themeColor : '','color': index==ProductNavindex ? '#fff' : '' }">{{item.chiild[1].val}}</view>
-			</view>
-		</view>
-		<!-- 首发新品 -->
-		<view class="list-box animated" :class='tempArr.length > 0?"fadeIn on":""'>
-			<view class="item" v-for="(item,index) in tempArr" :key="index" @click="goDetail(item)">
-				<view class="pictrue">
-					<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor" v-if="item.activity && item.activity.type === '1'">{{$t(`秒杀`)}}</span>
-					<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor" v-if="item.activity && item.activity.type === '2'">{{$t(`砍价`)}}</span>
-					<span class="pictrue_log pictrue_log_class" :style="'background-color:'+labelColor" v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
-					<image :src="item.image" mode="aspectFit"></image>
-				</view>
-				<view class="text-info">
-					<view class="title line1" v-if="titleShow">{{item.store_name}}</view>
-					<view class="old-price" v-if="opriceShow"><text>{{$t(`￥`)}}</text>{{item.ot_price}}</view>
-					<view class="price" :style="{color:fontColor}">
-						<view v-if="priceShow">
-							<text>{{$t(`￥`)}}</text>{{item.price}}
-						</view>
-						<view class="txt" :style="'border:1px solid '+labelColor+';color:'+labelColor" :class="priceShow?'':'on'" v-if="item.checkCoupon && couponShow">{{$t(`券`)}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'promotionList',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			tempArr: {
-				type: Array,
-				default: []
-			},
-			iSshowH: {
-				type: Boolean,
-				default: false
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				ProductNavindex: 0,
-				explosiveMoney: this.dataConfig.tabConfig.list,
-				numConfig: this.dataConfig.numConfig.val,
-				// imgStyle: this.dataConfig.imgStyle.type,
-				mbConfig: this.dataConfig.mbConfig.val,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				titleShow: this.dataConfig.titleShow.val, //标题是否显示
-				opriceShow: this.dataConfig.opriceShow.val, //原价是否显示
-				priceShow: this.dataConfig.priceShow.val, //价格是否显示
-				couponShow: this.dataConfig.couponShow.val,//优惠券标签是否显示
-				titleConfig: this.dataConfig.titleConfig.type, //标题位置
-				fontColor: this.dataConfig.fontColor.color[0].item,
-				labelColor: this.dataConfig.labelColor.color[0].item
-			};
-		},
-		created() {
-		},
-		methods: {
-			// 首发新品切换
-			ProductNavTab(type, index) {
-				this.ProductNavindex = index;
-				this.$emit('changeTab', type);
-			},
-			goDetail(item){
-				this.$emit('detail',item);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.index-product-wrapper {
-		margin: 30rpx 20rpx 0 20rpx;
-
-		&.on {
-			min-height: 1500rpx;
-		}
-
-		.nav-bd {
-			display: flex;
-			align-items: center;
-			margin-top: 30rpx;
-
-			.item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				width: 25%;
-				
-				&.on{
-					border-radius: 0;
-				}
-
-				.txt {
-					font-size: 32rpx;
-					color: #282828;
-				}
-
-				.label {
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 124rpx;
-					height: 32rpx;
-					margin-top: 5rpx;
-					font-size: 24rpx;
-					color: #999;
-					border-radius: 16rpx;
-				}
-			}
-		}
-
-		.list-box {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			margin-top: 30rpx;
-
-			.item {
-				width: 345rpx;
-				margin-bottom: 20rpx;
-				background-color: #fff;
-				border-radius: 20rpx;
-				overflow: hidden;
-				position: relative;
-
-				.pictrue_log {
-					width: 92rpx;
-					height: 44rpx;
-					font-size: 26rpx;
-					line-height: 44rpx;
-				}
-
-				image {
-					width: 100%;
-					height: 346rpx;
-					display: block;
-				}
-
-				.text-info {
-					padding: 10rpx 20rpx 15rpx;
-
-					.title {
-						color: #222222;
-					}
-
-					.old-price {
-						margin-top: 4rpx;
-						font-size: 26rpx;
-						color: #AAAAAA;
-						text-decoration: line-through;
-
-						text {
-							margin-right: 2px;
-							font-size: 20rpx;
-						}
-					}
-
-					.price {
-						display: flex;
-						align-items: flex-end;
-						font-size: 36rpx;
-						font-weight: 550;
-
-						text {
-							padding-bottom: 4rpx;
-							font-size: 26rpx;
-							font-weight: normal;
-						}
-
-						.txt {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 28rpx;
-							height: 28rpx;
-							margin-left: 15rpx;
-							margin-bottom: 10rpx;
-							border-radius: 4rpx;
-							font-size: 20rpx;
-							font-weight: normal;
-							&.on{
-								margin-left: 0;
-							}
-						}
-					}
-				}
-			}
-
-			&.on {
-				display: flex;
-			}
-		}
-	}
-</style>

pages/index/diy/components/seckill.vue

@@ -1,240 +0,0 @@
-<template>
-	<view v-show="!isSortType" v-if="spikeList.length>0">
-		<view class="spike-box" :class="conStyle?'borderRadius20':''" :style="{background:bgColor,margin:'0 '+prConfig*2+'rpx',marginTop:mbConfig*2+'rpx'}">
-			<view class="hd">
-				<view class="left">
-					<image :src="imgUrl" class="icon" v-if="imgUrl"></image>
-					<!-- <image src="/static/images/spike-icon-002.gif" class="icon" v-else></image> -->
-					
-					<view class="name">{{$t(`限时秒杀`)}}</view>
-					<!-- <image src="/static/images/spike-icon-001.png" class="title"></image> -->
-					<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '" :second-text="' '"
-					 :datatime="datatime" :bgColor="countDownColor" :colors="themeColor"></countDown>
-				</view>
-				<navigator class="more" url="/pages/activity/goods_seckill/index">{{$t(`更多`)}} <text class="iconfont icon-jiantou"
-					 hover-class='none'></text></navigator>
-			</view>
-			<view class="spike-wrapper">
-				<scroll-view scroll-x="true" style="white-space: nowrap; display: flex" show-scrollbar="false">
-					<navigator class="spike-item" :style="'margin-right:'+ lrConfig*2 +'rpx;'" v-for="(item,index) in spikeList" :key="index" :url="'/pages/activity/goods_seckill_details/index?id='+item.id+'&time='+datatime+'&status=1'"
-					 hover-class='none'>
-						<view class="img-box">
-							<image :src="item.image" mode="aspectFill"></image>
-							<view v-if="discountShow" class="msg flex-aj-center" :style="'color:'+ themeColor +';border-color:'+ themeColor +';'">{{item.discountNum}}{{$t(`off`)}}</view>
-						</view>
-						<view class="info">
-							<view v-if="titleShow" class="name line1">{{item.title}}</view>
-							<view class="price-box">
-								<text v-if="seckillShow" class="tips" :style="'background-color:'+ themeColor +';'">{{$t(`抢`)}}</text>
-								<text v-if="priceShow" class="price" :style="'color:'+themeColor+';'"><text>{{$t(`￥`)}}</text>{{item.price}}</text>
-							</view>
-						</view>
-					</navigator>
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-	
-</template>
-
-<script>
-	import countDown from '@/components/countDown';
-	import {
-		getSeckillIndexTime,
-		getSeckillList
-	} from '@/api/activity.js';
-	export default {
-		name: 'seckill',
-		components:{
-			countDown
-		},
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				datatime:'',
-				spikeList: [],
-				countDownColor: this.dataConfig.countDownColor.color[0].item,
-				themeColor: this.dataConfig.themeColor.color[0].item,
-				numberConfig: this.dataConfig.numberConfig.val,
-				lrConfig:this.dataConfig.lrConfig.val,
-				mbConfig:this.dataConfig.mbConfig.val,
-				imgUrl:this.dataConfig.imgConfig.url,
-				priceShow:this.dataConfig.priceShow.val,
-				discountShow:this.dataConfig.discountShow.val,
-				titleShow:this.dataConfig.titleShow.val,
-				seckillShow:this.dataConfig.seckillShow.val,
-				conStyle:this.dataConfig.conStyle.type,
-				prConfig:this.dataConfig.prConfig.val,
-				bgColor:this.dataConfig.bgColor.color[0].item
-			};
-		},
-		created() {
-		},
-		mounted() {
-			this.getSeckillIndexTime();
-		},
-		methods: {
-			getSeckillIndexTime() {
-				let limit = this.$config.LIMIT;
-				let params = {
-					page: 1,
-					limit: this.numberConfig>=limit?limit:this.numberConfig,
-					type: 'index'
-				}
-				getSeckillIndexTime().then(res => {
-					if (res.data.seckillTimeIndex === -1) {
-						return;
-					}
-					this.datatime = res.data.seckillTime[res.data.seckillTimeIndex].stop
-					let id = res.data.seckillTime[res.data.seckillTimeIndex].id
-					getSeckillList(id, params).then(({
-						data
-					}) => {
-						data.forEach((item) => {
-							let num = 0
-							if (item.price > 0 && item.ot_price > 0) num = ((parseFloat(item.price) / parseFloat(item.ot_price)).toFixed(
-								2))
-							item.discountNum = this.$util.$h.Mul(num, 10)
-						})
-						this.spikeList = data
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.spike{
-		padding: 20rpx;
-	}
-	.spike-box {
-		padding: 23rpx 20rpx 18rpx 20rpx;
-		background-color: #fff;
-		overflow: hidden;
-		box-shadow: 0px 0px 16px 3px rgba(0, 0, 0, 0.04);
-		.hd {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-	
-			.left {
-				display: flex;
-				align-items: center;
-				width: 500rpx;
-				.name{
-					font-size: 32rpx;
-					font-weight: 600;
-				}
-	
-				.icon {
-					width: 36rpx;
-					height: 36rpx;
-					margin-right: 12rpx;
-				}
-	
-				.title {
-					width: 134rpx;
-					height: 33rpx;
-				}
-			}
-	
-			.more {
-				font-size: 26rpx;
-				color: #999;
-	
-				.iconfont {
-					margin-left: 6rpx;
-					font-size: 25rpx;
-				}
-			}
-		}
-	
-		.spike-wrapper {
-			width: 100%;
-			margin-top: 27rpx;
-	
-			.spike-item {
-				display: inline-block;
-				width: 222rpx;
-				background-color: #fff;
-				border-radius: 16rpx;
-				padding-bottom: 8rpx;
-	
-				.img-box {
-					position: relative;
-					height: 222rpx;
-	
-					image {
-						width: 100%;
-						height: 222rpx;
-						border-radius: 16rpx;
-					}
-	
-					.msg {
-						position: absolute;
-						left: 10rpx;
-						bottom: 16rpx;
-						width: 86rpx;
-						height: 30rpx;
-						background: rgba(255, 255, 255, 1);
-						border: 1px solid rgba(255, 109, 96, 1);
-						border-radius: 6rpx;
-						font-size: 20rpx;
-						color: $theme-color;
-					}
-				}
-	
-	
-				.info {
-					margin-top: 10rpx;
-					padding: 0 10rpx;
-	
-					.name {
-						font-size: 26rpx;
-					}
-	
-					.price-box {
-						display: flex;
-						align-items: center;
-						justify-content: start;
-						margin-top: 4rpx;
-	
-						.tips {
-							display: flex;
-							align-items: center;
-							justify-content: center;
-							width: 28rpx;
-							height: 28rpx;
-							background-color: $theme-color;
-							color: #fff;
-							font-size: 20rpx;
-							border-radius: 2px;
-						}
-	
-						.price {
-							display: flex;
-							margin-left: 10rpx;
-							color: $theme-color;
-							font-size: 28rpx;
-							font-weight: bold;
-	
-							text {
-								font-size: 18rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/swiperBg.vue

@@ -1,235 +0,0 @@
-<template>
-	<view class="swiperBg skeleton-rect" :style="'margin-top:' + marginTop*2 +'rpx;'" v-show="!isSortType">
-		<block v-if="imgUrls.length">
-			<view class="colorBg" :style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 50%, '+ bgColor[1].item +' 100%);'"
-			 v-if="isColor"></view>
-			<view class="swiper" :class="[imgConfig?'':'fillet']" :style="'padding: 0 '+ paddinglr +'rpx;'">
-				<swiper :style="'height:'+ imageH +'rpx;'" :autoplay="true" :circular="circular"
-				 :interval="interval" :duration="duration" indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
-				 @change='bannerfun'>
-					<block v-for="(item,index) in imgUrls" :key="index">
-						<swiper-item>
-							<view @click="goDetail(item)" class='slide-navigator acea-row row-between-wrapper'>
-								<image :src="item.img" mode="aspectFill" class="slide-image aa" :style="'height:'+ imageH +'rpx;'">
-								</image>
-							</view>
-						</swiper-item>
-					</block>
-				</swiper>
-				<view v-if="docConfig==0" class="dot acea-row" :style="{paddingLeft: paddinglr+20 + 'rpx',paddingRight: paddinglr+20 + 'rpx',justifyContent: (txtStyle==1?'center':txtStyle==2?'flex-end':'flex-start')}">
-					<view class="dot-item" :style="active==index?'background:'+ dotColor:''" v-for="(item,index) in imgUrls"></view>
-				</view>
-				<view v-if="docConfig==1" class="dot acea-row" :style="{paddingLeft: paddinglr+20 + 'rpx',paddingRight: paddinglr+20 + 'rpx',justifyContent: (txtStyle==1?'center':txtStyle==2?'flex-end':'flex-start')}">
-					<view class="dot-item line_dot-item" :style="active==index?'background:'+ dotColor:''" v-for="(item,index) in imgUrls"></view>
-				</view>
-				<view v-if="docConfig==2" class="dot acea-row" :style="{paddingLeft: paddinglr+20 + 'rpx',paddingRight: paddinglr+20 + 'rpx',justifyContent: (txtStyle==1?'center':txtStyle==2?'flex-end':'flex-start')}">
-					<view class="instruct">{{current}}/{{imgUrls.length}}</view>
-				</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'swiperBg',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType: {
-				type: String | Number,
-				default: 0
-			}
-		},
-		data() {
-			return {
-				circular: true,
-				autoplay: true,
-				interval: 3000,
-				duration: 500,
-				imgUrls: [], //图片轮播数据
-				bgColor: this.dataConfig.bgColor.color, //轮播背景颜色
-				marginTop: this.dataConfig.mbConfig.val, //组件上边距
-				paddinglr: (this.dataConfig.lrConfig.val)*2, //轮播左右边距
-				docConfig: this.dataConfig.docConfig.type, //指示点样式
-				imgConfig: this.dataConfig.imgConfig.type, //是否为圆角
-				imageH: 280,
-				isColor: this.dataConfig.isShow.val,
-				txtStyle: this.dataConfig.txtStyle.type,
-				dotColor: this.dataConfig.dotColor.color[0].item,
-				current: 1,//数字指示器当前
-				active:0//一般指示器当前
-			};
-		},
-		watch: {
-			imageH(nVal, oVal) {
-				let self = this
-				this.imageH = nVal
-			},
-		},
-		created() {
-			this.imgUrls = this.dataConfig.swiperConfig.list
-		},
-		mounted() {
-			if(this.imgUrls.length){
-				let that = this;
-				this.$nextTick((e) => {
-					uni.getImageInfo({
-						src: that.setDomain(that.imgUrls[0].img),
-						success: (res) => {
-							if (res && res.height > 0) {
-								// that.$set(that, 'imageH',
-								// 	res.height / res
-								// 	.width * 750)
-								let height = res.height * ((750-this.paddinglr*2) / res.width)
-								that.$set(that, 'imageH', height);	
-							} else {
-								that.$set(that, 'imageH', 375);
-							}
-						},
-						fail: function(error) {
-							that.$set(that, 'imageH', 375);
-						}
-					})
-				})
-			}
-		},
-		methods: {
-			bannerfun(e) {
-				this.active = e.detail.current;
-				this.current = e.detail.current + 1;
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-			goDetail(url) {
-				let urls = url.info[1].value
-				if (urls.indexOf("http") != -1) {
-					// #ifdef H5
-					location.href = urls
-					// #endif
-					// #ifdef MP || APP-PLUS
-					uni.navigateTo({
-						url: `/pages/annex/web_view/index?url=${urls}`
-					});
-					// #endif
-				} else {
-					if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index']
-						.indexOf(urls) == -1) {
-						uni.navigateTo({
-							url: urls
-						})
-					} else {
-						uni.reLaunch({
-							url: urls
-						})
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.swiperBg {
-		position: relative;
-		// #ifdef APP-PLUS
-		// padding-top: 100rpx;
-
-		// #endif
-		.colorBg {
-			position: absolute;
-			left: 0;
-			top: 0;
-			height: 130rpx;
-			width: 100%;
-		}
-
-		.swiper {
-			z-index: 20;
-			position: relative;
-			overflow: hidden;
-			.dot{
-				position: absolute;
-				left:0;
-				bottom: 20rpx;
-				width: 100%;
-				.instruct {
-					width: 50rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					background-color: rgba(0,0,0,0.8);
-					color: #fff;
-					border-radius: 16rpx;
-					font-size: 24rpx;
-					text-align: center;
-				}
-				.dot-item{
-					width: 10rpx;
-					height: 10rpx;
-					background: rgba(0, 0, 0, .4);
-					border-radius: 50%;
-					margin: 0 4px;
-					&.line_dot-item{
-						width: 20rpx;
-						height: 5rpx;
-						border-radius: 3rpx;
-					}
-				}
-			}
-			/* 设置圆角 */
-			&.fillet {
-				border-radius: 10rpx;
-
-				image {
-					border-radius: 10rpx;
-				}
-			}
-
-			swiper,
-			.swiper-item,
-			image {
-				width: 100%;
-				display: block;
-			}
-
-			// 圆形指示点
-			&.circular {
-				/deep/.uni-swiper-dot {
-					width: 10rpx !important;
-					height: 10rpx !important;
-					background: rgba(0, 0, 0, .4) !important
-				}
-
-				/deep/.uni-swiper-dot-active {
-					background: #fff !important
-				}
-			}
-
-			// 方形指示点
-			&.square {
-				/deep/.uni-swiper-dot {
-					width: 20rpx !important;
-					height: 5rpx !important;
-					border-radius: 3rpx;
-					background: rgba(0, 0, 0, .4) !important
-				}
-
-				/deep/.uni-swiper-dot-active {
-					background: #fff !important
-				}
-			}
-		}
-	}
-
-	.item-img image {
-		display: block;
-		width: 100%;
-	}
-</style>

pages/index/diy/components/swipers.vue

@@ -1,149 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<view class="swipers" :class="[docConfig?'square':'circular',imgConfig?'':'fillet']" v-if="imgUrls.length && tabConfig" :style="'padding:0 '+lrConfig+'rpx;margin-top:' + mbConfig +'rpx;'">
-			<swiper :style="'height:'+(imageH+10)+'rpx;'" indicator-dots="true" :autoplay="true" :circular="circular" :interval="interval" :duration="duration"
-			 indicator-color="#E4E4E4" indicator-active-color="#E93323" :previous-margin="itemEdge+'rpx'" :next-margin="itemEdge+'rpx'" :current="swiperCur"
-			 @change="swiperChange">
-				<block v-for="(item,index) in imgUrls" :key="index">
-					<swiper-item :class="{active:index == swiperCur}">
-						<navigator :url='item.info[1].title' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
-							<image :src="item.img" class="slide-image" mode="widthFix"></image>
-						</navigator>
-					</swiper-item>
-				</block>
-			</swiper>
-		</view>
-		<view :style="'margin-top:' + mbConfig +'rpx;'" v-if="!tabConfig">
-			<navigator :url="item.info[1].title" hover-class="none" class="advert" :class="imgConfig?'':'fillet'" :style="'padding:0 '+lrConfig+'rpx;'" v-for="(item,index) in imgUrls" :key="index">
-				<image :src="item.img"></image>
-			</navigator>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'swiper',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				indicatorDots: false,
-				circular: true,
-				autoplay: true,
-				interval: 2500,
-				duration: 500,
-				swiperCur: 0,
-				imgUrls: [],
-				docConfig: this.dataConfig.docConfig.type,
-				imgConfig: this.dataConfig.imgConfig.type,
-				itemEdge: this.dataConfig.itemEdge.val,
-				lrConfig: this.dataConfig.lrConfig.val,
-				mbConfig: this.dataConfig.mbConfig.val,
-				tabConfig: this.dataConfig.tabConfig.tabVal,
-				imageH: 0
-			};
-		},
-		watch:{
-			imageH(nVal,oVal){
-				this.imageH = nVal
-			}
-		},
-		created() {
-			this.imgUrls = this.dataConfig.swiperConfig.list
-		},
-		mounted() {
-			let that = this;
-			uni.getImageInfo({
-				src: that.setDomain(that.imgUrls[0].img),
-				success: function(res) {
-					that.$set(that, 'imageH', res.height);
-				}
-			})
-		},
-		methods: {
-			// swiper
-			swiperChange(e) {
-				this.swiperCur = e.detail.current
-			},
-			//替换安全域名
-			setDomain: function(url) {
-				url = url ? url.toString() : '';
-				//本地调试打开,生产请注销
-				if (url.indexOf("https://") > -1) return url;
-				else return url.replace('http://', 'https://');
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.advert{
-		box-sizing: border-box;
-		image{
-			width: 100%;
-			box-sizing: border-box;
-			display: block;
-		}
-	}
-	.swipers {
-		position: relative;
-		width: 100%;
-		margin: 0 auto;
-		border-radius: 10rpx;
-		/* 设置圆角 */
-		&.fillet {
-			border-radius: 10rpx;
-		
-			image {
-				border-radius: 10rpx;
-			}
-		}
-		
-		swiper,
-		.swiper-item,
-		image {
-			width: 100%;
-		}
-		image{
-			transform: scale(.93);
-			transition: all .6s ease;
-		}
-		swiper-item.active {
-			image {
-				transform: scale(1);
-			}
-		}
-		// 圆形指示点
-		&.circular{
-			/deep/.uni-swiper-dot{
-				width: 10rpx!important;
-				height: 10rpx!important;
-				background: rgba(0,0,0,.4)!important
-			}
-			/deep/.uni-swiper-dot-active{
-				background: #fff!important
-			}
-		}
-		// 方形指示点
-		&.square{
-			/deep/.uni-swiper-dot{
-				width: 20rpx!important;
-				height: 5rpx!important;
-				border-radius: 3rpx;
-				background: rgba(0,0,0,.4)!important
-			}
-			/deep/.uni-swiper-dot-active{
-				background: #fff!important
-			}
-		}
-	}
-</style>

pages/index/diy/components/tabNav.vue

@@ -1,205 +0,0 @@
-<template>
-	<view>
-		<!-- #ifdef MP || APP-PLUS -->
-		<view style="visibility: hidden;" :style="{ height: navHeight + 'px' }" v-if="isFixed"></view>
-		<!-- #endif -->
-		<view class="navTabBox"
-			:style="'background: linear-gradient(90deg, '+ bgColor[0].item +' 50%, '+ bgColor[1].item +' 100%);margin-top:'+mbConfig*2+'rpx;color:'+txtColor+';top:'+isTop"
-			:class="{isFixed:isFixed}">
-			<view class="longTab">
-				<scroll-view scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation
-					:scroll-left="tabLeft" show-scrollbar="true">
-					<view :url="'/pages/goods/goods_list/index?cid='+item.id+'&title='+item.cate_name" class="longItem"
-						:style='"width:"+isWidth+"px"' :data-index="index" :class="index===tabClick?'click':''"
-						v-for="(item,index) in tabTitle" :key="index" :id="'id'+index" @click="longClick(item,index)">
-						{{$t(item.cate_name)}}
-					</view>
-					<view class="underlineBox" :style='"transform:translateX("+isLeft+"px);width:"+isWidth+"px"'>
-						<view class="underline"></view>
-					</view>
-				</scroll-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getCategoryList
-	} from '@/api/store.js';
-	export default {
-		name: 'tabNav',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isFixed: {
-				type: Boolean | String | Number,
-				default: false
-			}
-		},
-		data() {
-			return {
-				tabTitle: [],
-				tabLeft: 0,
-				isWidth: 0, //每个导航栏占位
-				tabClick: 0, //导航栏被点击
-				isLeft: 0, //导航栏下划线位置
-				bgColor: this.dataConfig.bgColor.color,
-				mbConfig: this.dataConfig.mbConfig.val,
-				txtColor: this.dataConfig.txtColor.color[0].item,
-				fixedTop: 0,
-				isTop: 0,
-				navHeight: 0
-			};
-		},
-		created() {
-			let that = this;
-			that.getAllCategory();
-			// 获取设备宽度
-			uni.getSystemInfo({
-				success(e) {
-					that.isWidth = e.windowWidth / 5
-				}
-			})
-		},
-		methods: {
-			// 导航栏点击
-			longClick(item, index) {
-				if (this.tabTitle.length > 5) {
-					this.tabLeft = (index - 2) * this.isWidth //设置下划线位置
-				}
-				this.tabClick = index //设置导航点击了哪一个
-				this.isLeft = index * this.isWidth //设置下划线位置
-				this.$emit('bindSortId', item.id)
-			},
-			// 获取导航
-			getAllCategory: function() {
-				let that = this;
-				getCategoryList().then(res => {
-					res.data.unshift({
-						"id": -99,
-						'cate_name': that.$t(`首页`)
-					})
-					that.tabTitle = res.data;
-					setTimeout((e) => {
-						const query = uni.createSelectorQuery().in(this);
-						query.select('.navTabBox').boundingClientRect(data => {
-							that.domOffsetTop = data.top
-							that.navHeight = data.height
-							that.$emit('bindHeight', data)
-						}).exec();
-					}, 200)
-					// #ifdef MP || APP-PLUS
-					this.isTop = (uni.getSystemInfoSync().statusBarHeight + 43) + 'px'
-					// #endif
-					// #ifdef H5 
-					this.isTop = 0
-					// #endif
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.navTabBox {
-		width: 100%;
-		background: linear-gradient(90deg, $bg-star 50%, $bg-end 100%);
-		color: rgba(255, 255, 255, 1);
-		padding-bottom: 20rpx;
-
-		&.isFixed {
-			z-index: 45;
-			position: fixed;
-			left: 0;
-			width: 100%;
-			/* #ifdef H5 */
-			padding-top: 20rpx;
-			top: 0;
-			/* #endif */
-		}
-
-		.longTab {
-			width: 100%;
-
-			.longItem {
-				height: 50rpx;
-				display: inline-block;
-				line-height: 50rpx;
-				text-align: center;
-				font-size: 30rpx;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				white-space: nowrap;
-
-				&.click {
-					font-weight: bold;
-				}
-			}
-
-			.underlineBox {
-				height: 3px;
-				width: 20%;
-				display: flex;
-				align-content: center;
-				justify-content: center;
-				transition: .5s;
-
-				.underline {
-					width: 33rpx;
-					height: 4rpx;
-					background-color: white;
-				}
-			}
-		}
-	}
-
-	.child-box {
-		width: 100%;
-		position: relative;
-		background-color: #fff;
-		box-shadow: 0 2px 5px 1px rgba(0, 0, 0, 0.02);
-
-		.wrapper {
-			display: flex;
-			align-items: center;
-			padding: 20rpx 0;
-			background: #fff;
-		}
-
-		.child-item {
-			flex-shrink: 0;
-			width: 140rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			margin-left: 10rpx;
-
-			image {
-				width: 90rpx;
-				height: 90rpx;
-				border-radius: 50%;
-			}
-
-			.txt {
-				font-size: 24rpx;
-				color: #282828;
-				text-align: center;
-				margin-top: 10rpx;
-			}
-
-			&.on {
-				image {
-					border: 1px solid $theme-color-opacity;
-				}
-
-				.txt {
-					color: $theme-color;
-				}
-			}
-		}
-	}
-</style>

pages/index/diy/components/titles.vue

@@ -1,67 +0,0 @@
-<template>
-	<view v-show="!isSortType">
-		<view v-if="titleConfig" :style="'margin:0 '+prConfig*2+'rpx;'">
-			<navigator :url="linkConfig" hover-class="none" class='title' :class="[(textPosition==0?'left':textPosition==2?'right':''),(textStyle==1?'italics':textStyle==2?'blod':''), (bgStyle===0?'':'borderRadius15')]" :style="'font-size:'+fontSize+'rpx;margin-top:'+mbConfig*2+'rpx;background-color:'+titleColor+';color:'+themeColor+';'">
-				<div>{{titleConfig}}</div>
-			</navigator>
-		</view>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		name: 'titles',
-		props: {
-			dataConfig: {
-				type: Object,
-				default: () => {}
-			},
-			isSortType:{
-				type: String | Number,
-				default:0
-			}
-		},
-		data() {
-			return {
-				fontSize:this.dataConfig.fontSize.val*2,
-				linkConfig:this.dataConfig.linkConfig.value,
-				mbConfig:this.dataConfig.mbConfig.val,
-				textPosition:this.dataConfig.textPosition.type,
-				textStyle:this.dataConfig.textStyle.type,
-				titleColor:this.dataConfig.titleColor.color[0].item,
-				titleConfig:this.dataConfig.titleConfig.value,
-				themeColor:this.dataConfig.themeColor.color[0].item,
-				prConfig:this.dataConfig.prConfig.val,
-				bgStyle:this.dataConfig.bgStyle.type
-			};
-		},
-		created() {},
-		methods: {}
-	}
-</script>
-
-<style lang="scss">
-	.title{
-		font-size: 40rpx;
-		color: #282828;
-		text-align: center;
-		width: 100%;
-		padding: 20rpx;
-		box-sizing: border-box;
-		
-		&.left{
-			text-align: left;
-		}
-		&.right{
-			text-align: right;
-		}
-		&.blod{
-			font-weight: bold;
-		}
-		&.italics{
-			font-style: italic;
-		}
-	}
-	
-</style>

pages/points_mall/exchange_record.vue

@@ -46,7 +46,6 @@
 	</view>
 </template>
 <script>
-	import CountDown from "@/components/countDown";
 	import emptyPage from '@/components/emptyPage.vue'
 	import {
 		getIntegralOrderList
@@ -57,7 +56,6 @@
 	export default {
 		name: "BargainRecord",
 		components: {
-			CountDown,
 			Loading,
 			emptyPage,
 			home

pages/points_mall/index.vue

@@ -106,7 +106,6 @@
 </template>
 
 <script>
-	// import swipers from './components/swiper.vue';
 	import {
 		mapGetters
 	} from 'vuex';
@@ -120,7 +119,6 @@
 	import {HTTP_REQUEST_URL} from '@/config/app';
 	export default {
 		components: {
-			// swipers
 		},
 		mixins: [colors],
 		data() {

pages/points_mall/integral_goods_details.vue

@@ -135,7 +135,6 @@
 	import authorize from '@/components/Authorize';
 	// #endif
 	import parser from "@/components/jyf-parser/jyf-parser";
-	import countDown from '@/components/countDown';
 	import {
 		imageBase64
 	} from "@/api/public";
@@ -238,7 +237,6 @@
 			userEvaluation,
 			kefuIcon,
 			"jyf-parser": parser,
-			countDown,
 			cusPreviewImg,
 			homeList,
 			// #ifdef MP