Explorar o código

首页diy部分修改

huangzhe %!s(int64=3) %!d(string=hai) anos
pai
achega
f50dbe4589

+ 1 - 1
src/components/basic-component/app-goods/app-goods.vue

xqd
@@ -46,7 +46,7 @@
 			<!-- 商品 -->
 			<view @click="toDetail" class="goods-info dir-top-nowrap main-between box-grow-1" :class="[textStyle == 2 ? 'main-center' :'',showTag && pluginTag ? '' : 'no-tag']" v-if="showGoodsName || isUnderLinePrice || showGoodsPrice">
 				<view class="goods-top">
-					<view v-if="showGoodsName" class="goods-name t-omit-two" :style="{textAlign: textStyle == 2 ? 'center' : 'left'}">
+					<view v-if="showGoodsName" class="goods-name t-omit" :style="{textAlign: textStyle == 2 ? 'center' : 'left'}">
 						<text v-if="showTag && pluginTag" :style="{'background-color': themeColor.background}" class="tag">{{pluginTag}}</text>
 						<text>{{goods.name || goods.goods_name}}</text>
 					</view>

+ 94 - 2
src/components/page-component/app-associated-link/app-associated-link.vue

xqd xqd
@@ -23,14 +23,22 @@
                     	<view :style="{backgroundColor: styleColor}" class="bottom-icon"></view>
                     </view>
                 </view>
-                <view v-else-if="styleNum == '4'" class="app-link-title box-grow-1 dir-left-nowrap cross-center">
+                <!-- <view v-else-if="styleNum == '4'" class="app-link-title box-grow-1 dir-left-nowrap cross-center">
                     <image :style="{backgroundColor: styleColor}" class="app-title-line div" :src="styleImg.div"></image>
                     <view :style="{color: color}">{{title}}</view>
-                </view>
+                </view> -->
                 <view v-else-if="styleNum == '5'" class="app-link-title box-grow-1 dir-left-nowrap cross-center">
                     <view :style="[{'border-color':`${styleColor}`,'background-color':`${background}`}]" class="app-title-line radius"></view>
                     <view :style="{color: color}">{{title}}</view>
                 </view>
+				<view v-else-if="styleNum=='4'" class="hxj-link-diy">
+					<view>
+						<view class="title">{{title}}<image class="hxjImg"
+								src="https://t17.9026.com/web/statics/image/index/HUIXIANGJIA.png" mode=""></image>
+						</view>
+					</view>
+				
+				</view>
                 <view v-if="arrowsSwitch" class="app-more-text">更多</view>
 				<icon class="app-icon" v-if="arrowsSwitch" type></icon>
 			</view>
@@ -236,5 +244,89 @@
 		        vertical-align: top;
 		    }
     	}
+		
+		
+		.hxj-link-diy {
+			padding: 30rpx 40rpx;
+			position: relative;
+			font-family: PingFangSC-Semibold, PingFang SC;
+			.hxj {
+				font-size: 40rpx;
+				font-weight: 600;
+				color: #e7dac1;
+				background: angular-gradient(180deg, #e1cfaf 0%, #fefffe 100%);
+				-webkit-background-clip: text;
+				// -webkit-text-fill-color: transparent;
+			}
+		
+			.title {
+				font-weight: 500;
+				color: #121212;
+				font-size: 32rpx;
+				position: relative;
+				z-index: 2;
+				.hxjImg {
+					width: 249rpx;
+					height: 31rpx;
+					position: absolute;
+					top: -9rpx;
+					left: 1rpx;
+					z-index: -1;
+				}
+			}
+			.title1 {
+				font-weight: 500;
+				font-size: 26rpx;
+				position: relative;
+				color: #121212;
+				z-index: 2;
+			}
+			.tyx {
+				width: 37rpx;
+				height: 37rpx;
+				position: absolute;
+				top: 26rpx;
+				left: 24rpx;
+				z-index: 1;
+			}
+			.d6 {
+				width: 32rpx;
+				height: 17rpx;
+				position: absolute;
+				top: 40rpx;
+				left: 234rpx;
+				z-index: 1;
+			}
+			.subtitle {
+				height: 34rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #a7a7a7;
+				line-height: 34rpx;
+			}
+			.coupon_1 {
+				width: 15rpx;
+				height: 15rpx;
+				margin-left: 25rpx;
+			}
+			.coupon_sub {
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #999999;
+				line-height: 28rpx;
+				letter-spacing: 3rpx;
+				margin-left: 25rpx;
+			}
+			.link-more{
+				font-size: 25rpx;
+				font-weight: 500;
+				color: #989898;
+				image{
+					width: 12rpx;
+					height: 19rpx;
+					margin-left: 6rpx;
+				}
+			}
+		}
 	}
 </style>

+ 402 - 320
src/components/page-component/app-exclusive-coupon/app-exclusive-coupon-two.vue

xqd xqd
@@ -1,14 +1,11 @@
 <template>
-    <view class="app-exclusive-coupon-two" :style="{'background-color': `${noneColor ? '' : background}`}">
-        <view class="app-bottom" v-if="coupon_list.length > 0">
-            <scroll-view scroll-x class="app-scroll dir-left-nowrap">
-                <view v-for="(item, index) in coupon_list"
-                      :key="index"
-                      class="app-item"
-                      :style="[couponBoxStyle(item,index)]"
-                >
-                    <app-form-id @click="receive(index)">
-                        <view class="coupon-bg">
+	<view class="app-exclusive-coupon-two" :style="{'background-color': `${noneColor ? '' : background}`}">
+		<view class="app-bottom" v-if="coupon_list.length > 0">
+			<scroll-view scroll-x class="app-scroll dir-left-nowrap">
+				<view v-for="(item, index) in coupon_list" :key="index" class="app-item"
+					:style="[couponBoxStyle(item,index)]">
+					<app-form-id @click="receive(index)">
+						<!-- <view class="coupon-bg">
                             <img style="height: 100%;width: 100%" :src="couponBgImg" alt="">
                         </view>
                         <view v-if="coupon_list.length === 1" class="dir-left-nowrap" style="height: 100%"
@@ -42,339 +39,424 @@
                                     {{item.is_receive == 0 ? receiveTip : item.is_receive > 0 ? '已领取' : ''}}
                                 </text>
                             </view>
-                        </view>
-                    </app-form-id>
-                </view>
-            </scroll-view>
-        </view>
-    </view>
+                        </view> -->
+
+						<view class="coupon main-left">
+							<view class="item main-left">
+								<view class="Wb">
+									<view>
+										<view class="title_2">{{item.name}} <text
+												class="hjx-tc-B19D60 hjx-ts-21 hxj-ml-10">立即领取</text></view>
+										<view class="desc_2">新用户礼遇</view>
+									</view>
+									<view>
+										<view class="price"><text>¥</text>{{item.sub_price}}</view>
+										<view class="yxq">有效期至2021-12-31</view>
+									</view>
+								</view>
+							</view>
+						</view>
+
+					</app-form-id>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
 </template>
 
 <script>
-    export default {
-        name: 'app-exclusive-coupon-two',
-        props: {
-            receiveBg: {
-                type: String,
-                default: function() {
-                    return '';
-                }
-            },
-            list: {
-                type: Array,
-                default: function() {
-                    return [];
-                }
-            },
-            textColor: {
-                type: String,
-                default: function() {
-                    return  "#ffffff";
-                }
-            },
-            unclaimedBg: {
-                type: String,
-                default: function() {
-                    return ''
-                }
-            },
-            index: {
-                type: Number,
-            },
-            sign: {
-                type: String,
-            },
-            noneColor: {
-                type: Boolean,
-                default() {
-                    return false;
-                }
-            },
-            background: String,
-            page_id: Number,
-            template_id: Number,
-            is_required: Boolean,
-            coupon_req: Boolean,
-            couponBg: {
-                type: String,
-                default: '#D9BC8B',
-            },
-            //diy手动添加优惠券标识
-            addType: String,
-            couponBgType: {
-                type: String,
-                default() {
-                    return '#pure';
-                }
-            },
-            dIndex: {
-                type: Array,
-                default() {
-                    return [0, 0];
-                }
-            },
-            mIndex: {
-                type: Array,
-                default() {
-                    return [0, 0];
-                }
-            },
-            dType: String,
-        },
-        data() {
-            return {
-                coupon_list: []
-            };
-        },
-        computed: {
-            receiveTip() {
-                let receiveTip = '立即领取';
-                if (this.sign === 'integral-mall') {
-                    receiveTip = '立即兑换';
-                }
-                return receiveTip;
-            },
-            couponBgImg() {
-                //wechat ../../../
-                switch (this.coupon_list.length) {
-                    case 1:
-                        return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_1.png';
-                    case 2:
-                        return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_2.png';
-                    case 3:
-                        return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_3.png';
-                    default:
-                        return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_4.png';
-                }
-            },
+	export default {
+		name: 'app-exclusive-coupon-two',
+		props: {
+			receiveBg: {
+				type: String,
+				default: function() {
+					return '';
+				}
+			},
+			list: {
+				type: Array,
+				default: function() {
+					return [];
+				}
+			},
+			textColor: {
+				type: String,
+				default: function() {
+					return "#ffffff";
+				}
+			},
+			unclaimedBg: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			},
+			index: {
+				type: Number,
+			},
+			sign: {
+				type: String,
+			},
+			noneColor: {
+				type: Boolean,
+				default () {
+					return false;
+				}
+			},
+			background: String,
+			page_id: Number,
+			template_id: Number,
+			is_required: Boolean,
+			coupon_req: Boolean,
+			couponBg: {
+				type: String,
+				default: '#D9BC8B',
+			},
+			//diy手动添加优惠券标识
+			addType: String,
+			couponBgType: {
+				type: String,
+				default () {
+					return '#pure';
+				}
+			},
+			dIndex: {
+				type: Array,
+				default () {
+					return [0, 0];
+				}
+			},
+			mIndex: {
+				type: Array,
+				default () {
+					return [0, 0];
+				}
+			},
+			dType: String,
+		},
+		data() {
+			return {
+				coupon_list: []
+			};
+		},
+		computed: {
+			receiveTip() {
+				let receiveTip = '立即领取';
+				if (this.sign === 'integral-mall') {
+					receiveTip = '立即兑换';
+				}
+				return receiveTip;
+			},
+			couponBgImg() {
+				//wechat ../../../
+				switch (this.coupon_list.length) {
+					case 1:
+						return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_1.png';
+					case 2:
+						return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_2.png';
+					case 3:
+						return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_3.png';
+					default:
+						return 'https://shop.9026.com/web/statics/img/mall/diy/bg_coupon_index_4.png';
+				}
+			},
 
-            couponBoxStyle() {
-                return (data, index) => {
-                    let couponList = this.coupon_list;
-                    let width, background;
+			couponBoxStyle() {
+				return (data, index) => {
+					let couponList = this.coupon_list;
+					let width, background;
 
-                    let screenWidth = uni.getSystemInfoSync().windowWidth;
-                    let p = 750 / screenWidth;
-                    switch (couponList.length) {
-                        case 1:
-                            width = `${parseInt(702 / p)}px`;
-                            break;
-                        case 2:
-                            width = `${parseInt(341 / p)}px`;
-                            break;
-                        case 3:
-                            width = `${parseInt(220 / p)}px`;
-                            break;
-                        default:
-                            width = `${parseInt(274 / p)}px`;
-                            break;
-                    }
-                    let extra = {'margin-left': `${20 / p}px`};
-                    if (index === 0) extra = Object.assign(extra, {'margin-left': `${24 / p}px`});
-                    if (index === this.coupon_list.length - 1) extra = Object.assign(extra, {'margin-right': `${24 / p}px`});
-                    if (data.is_receive > 0) {
-                        background = '#B4B4B4';
-                    } else if (this.couponBgType === 'gradient') {
-                        background = 'linear-gradient(to left, ' + this.couponBg + ',' + this.$utils.colorRgba(this.couponBg, 0.5) + ')';
-                    } else {
-                        background = this.couponBg;
-                    }
-                    return Object.assign(extra, {
-                        background,
-                        'width': width,
-                        'min-width': couponList.length > 3 ? width : 'auto'
-                    });
-                }
-            }
-        },
-        methods: {
-            flushCache(coupon_list) {
-                if (this.page_id == 0) {
-                    let storage = this.$storage.getStorageSync('INDEX_MALL');
-                    let dIndex = this.dIndex;
-                    let mIndex = this.mIndex;
+					let screenWidth = uni.getSystemInfoSync().windowWidth;
+					let p = 750 / screenWidth;
+					switch (couponList.length) {
+						case 1:
+							width = `${parseInt(702 / p)}px`;
+							break;
+						case 2:
+							width = `${parseInt(341 / p)}px`;
+							break;
+						case 3:
+							width = `${parseInt(220 / p)}px`;
+							break;
+						default:
+							width = `${parseInt(274 / p)}px`;
+							break;
+					}
+					let extra = {
+						'margin-left': `${20 / p}px`
+					};
+					if (index === 0) extra = Object.assign(extra, {
+						'margin-left': `${24 / p}px`
+					});
+					if (index === this.coupon_list.length - 1) extra = Object.assign(extra, {
+						'margin-right': `${24 / p}px`
+					});
+					if (data.is_receive > 0) {
+						background = '#B4B4B4';
+					} else if (this.couponBgType === 'gradient') {
+						background = 'linear-gradient(to left, ' + this.couponBg + ',' + this.$utils.colorRgba(this
+							.couponBg, 0.5) + ')';
+					} else {
+						// background = this.couponBg;
+					}
+					return Object.assign(extra, {
+						background,
+						'width': width,
+						'min-width': couponList.length > 3 ? width : 'auto'
+					});
+				}
+			}
+		},
+		methods: {
+			flushCache(coupon_list) {
+				if (this.page_id == 0) {
+					let storage = this.$storage.getStorageSync('INDEX_MALL');
+					let dIndex = this.dIndex;
+					let mIndex = this.mIndex;
 
-                    if (this.dType === 'module') {
-                        storage.home_pages.navs[mIndex[0]].template.data[mIndex[1]].data.list[dIndex[0]].data[dIndex[1]].data.coupon_list = coupon_list;
-                    } else {
-                        storage.home_pages.navs[dIndex[0]].template.data[dIndex[1]].data.coupon_list = coupon_list;
-                    }
-                    this.$storage.setStorageSync('INDEX_MALL', storage);
-                }
-            },
-            receive(index) {
-                let list = this.coupon_list;
-                if (this.sign == 'integral-mall') {
-                    this.$jump({
-                        url: list[index].page_url,
-                        open_type: 'navigate'
-                    });
-                    return;
-                }
-                if (list[index].is_receive == 1) {
-                    uni.showToast({
-                        mask: true,
-                        title: '已领取',
-                        icon: 'none'
-                    });
-                    return true;
-                }
-                uni.showLoading({
-                    mask: true,
-                    title: '领取中'
-                });
+					if (this.dType === 'module') {
+						storage.home_pages.navs[mIndex[0]].template.data[mIndex[1]].data.list[dIndex[0]].data[dIndex[1]]
+							.data.coupon_list = coupon_list;
+					} else {
+						storage.home_pages.navs[dIndex[0]].template.data[dIndex[1]].data.coupon_list = coupon_list;
+					}
+					this.$storage.setStorageSync('INDEX_MALL', storage);
+				}
+			},
+			receive(index) {
+				let list = this.coupon_list;
+				if (this.sign == 'integral-mall') {
+					this.$jump({
+						url: list[index].page_url,
+						open_type: 'navigate'
+					});
+					return;
+				}
+				if (list[index].is_receive == 1) {
+					uni.showToast({
+						mask: true,
+						title: '已领取',
+						icon: 'none'
+					});
+					return true;
+				}
+				uni.showLoading({
+					mask: true,
+					title: '领取中'
+				});
 
-                this.$request({
-                    url: this.$api.coupon.receive,
-                    data: {
-                        coupon_id: list[index].id
-                    }
-                }).then(e => {
-                    uni.hideLoading();
-                    if (e.code === 0) {
-                        if (e.data.rest == 0) {
-                            this.coupon_list[index].is_receive = '1';
-                        }
-                        let tempList = this.coupon_list;
-                        this.flushCache(tempList);
-                        this.$store.dispatch('page/actionSetCoupon', {
-                            list: [Object.assign(tempList[index], e.data)],
-                            type: 'receive'
-                        });
-                    } else {
-                        uni.showToast({title: e.msg, icon: 'none'});
-                    }
-                }).catch(() => {
-                    uni.hideLoading();
-                });
-            },
+				this.$request({
+					url: this.$api.coupon.receive,
+					data: {
+						coupon_id: list[index].id
+					}
+				}).then(e => {
+					uni.hideLoading();
+					if (e.code === 0) {
+						if (e.data.rest == 0) {
+							this.coupon_list[index].is_receive = '1';
+						}
+						let tempList = this.coupon_list;
+						this.flushCache(tempList);
+						this.$store.dispatch('page/actionSetCoupon', {
+							list: [Object.assign(tempList[index], e.data)],
+							type: 'receive'
+						});
+					} else {
+						uni.showToast({
+							title: e.msg,
+							icon: 'none'
+						});
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				});
+			},
 
-            loadData() {
-                this.$request({
-                    url: this.$api.index.extra,
-                    data: {
-                        type: 'mall',
-                        key: 'coupon',
-                        page_id: this.page_id,
-                        index: this.index
-                    }
-                }).then(e => {
-                    this.coupon_list = e.data;
-                    if (this.page_id === 0) {
-                        let storage = this.$storage.getStorageSync('INDEX_MALL');
-                        storage.home_pages[this.index].list = this.coupon_list;
-                        this.$storage.setStorageSync('INDEX_MALL', storage);
-                    }
-                })
-            }
-        },
-        mounted() {
-            if (!this.coupon_req) {
-                if (this.is_required) {
-                    this.loadData();
-                } else {
-                    let storage = this.$storage.getStorageSync('INDEX_MALL');
-                    this.coupon_list = storage.home_pages[this.index].list;
-                }
-            } else {
-                this.coupon_list = this.list;
-            }
-        },
-    }
+			loadData() {
+				this.$request({
+					url: this.$api.index.extra,
+					data: {
+						type: 'mall',
+						key: 'coupon',
+						page_id: this.page_id,
+						index: this.index
+					}
+				}).then(e => {
+					this.coupon_list = e.data;
+					if (this.page_id === 0) {
+						let storage = this.$storage.getStorageSync('INDEX_MALL');
+						storage.home_pages[this.index].list = this.coupon_list;
+						this.$storage.setStorageSync('INDEX_MALL', storage);
+					}
+				})
+			}
+		},
+		mounted() {
+			if (!this.coupon_req) {
+				if (this.is_required) {
+					this.loadData();
+				} else {
+					let storage = this.$storage.getStorageSync('INDEX_MALL');
+					this.coupon_list = storage.home_pages[this.index].list;
+				}
+			} else {
+				this.coupon_list = this.list;
+			}
+		},
+	}
 </script>
 
 <style scoped lang="scss">
-    .app-exclusive-coupon-two {
-        width: #{750rpx};
+	.app-exclusive-coupon-two {
+		width: #{750rpx};
+
+		.coupon-bg {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+		}
+
+		.app-bottom {
+			padding: #{16rpx} 0;
+			// height: #{130+16+16rpx};
+			width: #{750rpx};
+
+			.app-scroll {
+				// height: #{130+16+16rpx};
+				// height: 100%;
+				del-width: #{750-24rpx};
+				white-space: nowrap;
+			}
+
+			.app-item {
+				width: #{256rpx};
+				position: relative;
+				// height: #{130rpx};
+				display: inline-block;
+				margin-left: #{20rpx};
+				background-repeat: no-repeat;
+				background-size: 100% 100%;
+
+				.app-number.app-symbol:before {
+					content: '¥';
+					font-size: #{20rpx};
+				}
+
+				app-number {
+					font-size: #{40rpx};
+				}
+
+				.discount:after {
+					content: '折';
+					font-size: 75%;
+				}
+
+				.app-text-left {
+					width: 75%;
+					height: #{130rpx};
 
-        .coupon-bg {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-        }
+					.app-text-top {
+						height: 50%;
+						padding-top: #{1rpx};
+						overflow: hidden;
+						text-align: center;
 
-        .app-bottom {
-            padding: #{16rpx} 0;
-            height: #{130+16+16rpx};
-            width: #{750rpx};
+						.app-symbol {
+							display: inline-block;
+							height: #{78rpx};
+							font-size: #{20rpx};
+						}
 
-            .app-scroll {
-                height: #{130+16+16rpx};
-                height: 100%;
-                del-width: #{750-24rpx};
-                white-space: nowrap;
-            }
+						.app-number {
+							display: inline-block;
+							height: 100%;
+						}
+					}
 
-            .app-item {
-                width: #{256rpx};
-                position: relative;
-                height: #{130rpx};
-                display: inline-block;
-                margin-left: #{20rpx};
-                background-repeat: no-repeat;
-                background-size: 100% 100%;
+					.app-text-bottom {
+						height: 50%;
+						text-align: center;
+						font-size: #{20rpx};
+						display: block;
+					}
+				}
 
-                .app-number.app-symbol:before {
-                    content: '¥';
-                    font-size: #{20rpx};
-                }
+				.app-text-right {
+					width: 25%;
+					height: #{130rpx};
 
-                app-number {
-                    font-size: #{40rpx};
-                }
+					text {
+						height: #{130rpx};
+						display: inline-block;
+						text-align: center;
+						line-height: #{50rpx};
+						font-size: #{24rpx};
+						writing-mode: vertical-rl;
+						letter-spacing: #{5rpx};
+					}
+				}
+			}
+		}
 
-                .discount:after {
-                    content: '折';
-                    font-size: 75%;
-                }
+		.coupon {
 
-                .app-text-left {
-                    width: 75%;
-                    height: #{130rpx};
+			// padding: 0 45rpx 0 40rpx;
+			.item {
+				width: 320rpx;
+				height: 200rpx;
+				overflow: hidden;
+				border-radius: 20rpx;
+				margin-right: 25rpx;
+				position: relative;
+				background-image: url(https://t17.9026.com/web/statics/image/index/coupon_masking.png);
+				background-size: 316rpx 200rpx;
 
-                    .app-text-top {
-                        height: 50%;
-                        padding-top: #{1rpx};
-                        overflow: hidden;
-                        text-align: center;
+				.Wb {
+					display: flex;
+					flex-flow: column;
+					justify-content: space-around;
+					padding: 17rpx 0 17rpx 37rpx;
 
-                        .app-symbol {
-                            display: inline-block;
-                            height: #{78rpx};
-                            font-size: #{20rpx};
-                        }
+					.price {
+						font-size: 40rpx;
+						font-family: PingFangSC-Medium, PingFang SC;
+						font-weight: 500;
+						color: #b19d60;
 
-                        .app-number {
-                            display: inline-block;
-                            height: 100%;
-                        }
-                    }
+						text {
+							font-size: 24rpx;
+						}
+					}
 
-                    .app-text-bottom {
-                        height: 50%;
-                        text-align: center;
-                        font-size: #{20rpx};
-                        display: block;
-                    }
-                }
+					.yxq {
+						font-size: 18rpx;
+						font-family: PingFangSC-Regular, PingFang SC;
+						font-weight: 400;
+						color: #c1c2c1;
+					}
+				}
+			}
+		}
 
-                .app-text-right {
-                    width: 25%;
-                    height: #{130rpx};
+		.title_2 {
+			font-weight: 600;
+			font-family: PingFangSC-Regular, PingFang SC;
+			color: #000;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #0e0e0e;
+		}
 
-                    text {
-                        height: #{130rpx};
-                        display: inline-block;
-                        text-align: center;
-                        line-height: #{50rpx};
-                        font-size: #{24rpx};
-                        writing-mode: vertical-rl;
-                        letter-spacing: #{5rpx};
-                    }
-                }
-            }
-        }
-    }
+		.desc_2 {
+			color: #5a5a5a;
+			font-size: 24rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #a7a7a7;
+		}
+	}
 </style>

+ 61 - 4
src/components/page-component/app-navigation-icon/app-navigation-two-icon.vue

xqd xqd
@@ -42,20 +42,29 @@
             <scroll-view scroll-x class="dir-left-nowrap" :style="{'height': modeType === 'img'? '192rpx': '100rpx'}">
                 <!-- #endif -->
                 <!-- #ifndef MP-BAIDU -->
-                <scroll-view scroll-x class="dir-left-nowrap" :style="{'max-height': modeType === 'img'? '192rpx': '100rpx'}">
+                <scroll-view scroll-x class="dir-left-nowrap" :style="{'max-height': modeType === 'img'? 'auto': '100rpx'}">
                     <!-- #endif -->
-                    <view v-for="(nav, index) in aloneNav" :key="index" :style="[formatB(index)]" class="box-list">
+                    <view v-for="(nav, index) in aloneNav" :key="index" :style="[formatB(index)]" class="box-list" style="margin-right: 15rpx;">
                         <!-- #ifdef MP -->
                         <app-jump-button style="height: 100%" form :url="nav.link_url" :open_type="nav.open_type"
                                          arrangement="column"
                                          class="cross-top">
-                            <image v-if="modeType === 'img'" :src="nav.icon_url"
+                          <!--  <image v-if="modeType === 'img'" :src="nav.icon_url"
                                    :style="{height:'88rpx',width: '88rpx','margin-bottom': 'auto'}"
                                    lazy-load></image>
                             <view v-if="nav.name" class="t-omit nav-name" :style="{color: color}"
                                   :class="{'nav-name-alone': modeType === 'text'}">
                                 {{ nav.name.substring(0, aloneNum > 5 ? 4 : 5) }}
-                            </view>
+                            </view> -->
+							<view class="hxj-nav-diy" >
+								<view class="box" style="width: 206rpx;height: 250rpx;">
+									<image class="image-bg" :src="nav.icon_url"></image>
+									<view class="text t-omit" :style="{color: color}">{{ nav.name.substring(0, aloneNum > 5 ? 4 : 5) }}</view>
+								</view>
+								<view class="tag_list">
+									<span class="tag">{{ nav.name.substring(0, aloneNum > 5 ? 4 : 5).slice(0,2)}}</span>
+								</view>
+							</view>
                         </app-jump-button>
                         <!--  #endif -->
                         <!--  #ifdef H5 -->
@@ -495,5 +504,53 @@ export default {
             border-radius: 50%;
         }
     }
+	
+	
+	.hxj-nav-diy{
+		.box {
+			border-radius: 20rpx;
+			overflow: hidden;
+			position: relative;
+			z-index: 2;
+			margin-right: 20rpx;
+		
+			.image-bg {
+				position: absolute;
+				z-index: -1;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				right: 0;
+				width: 100%;
+				height: 100%;
+			}
+		
+			.text {
+				width: 115rpx;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #FEFFFE;
+				text-shadow: 0px 0px 8px rgba(0, 0, 0, 0.17);
+				position: absolute;
+				top: 30rpx;
+				left: 50%;
+				transform: translateX(-50%);
+				z-index: 1;
+			}
+		}
+		
+		.tag_list {
+			margin-top: 20rpx;
+		
+			.tag {
+				width: auto;
+				background-color: rgba(238, 235, 222, 1);
+				color: rgb(167, 133, 79);
+				border-radius: 0 50% 50% 50%;
+				font-size: 24rpx;
+				padding: 10rpx 20rpx;
+			}
+		}
+	}
 }
 </style>

+ 4 - 2
src/components/page-component/app-swiper/app-swiper.vue

xqd
@@ -308,8 +308,10 @@
     }
 
     .u-indicator-item-rect {
-        width: 26rpx;
-        height: 8rpx;
+        // width: 26rpx;
+        // height: 8rpx;
+		width: 40rpx;
+		height: 4rpx;
         margin: 0 6rpx;
         transition: all 0.5s;
         background-color: rgba(0, 0, 0, 0.3);

+ 15 - 11
src/components/page-component/index/app-diy-page.vue

xqd xqd xqd xqd
@@ -141,17 +141,11 @@
               >
                 <template v-if="temp.data.catPosition === 'top'">
                   <!--分类-->
-                  <template
-                    v-if="
-                      temp.data.showCat &&
-                      temp.data.catList &&
-                      temp.data.catList.length > 1
-                    "
-                  >
+                  <template v-if="  temp.data.showCat && temp.data.catList && temp.data.catList.length > 1">
                     <scroll-view
                       scroll-x
                       :style="{ backgroundColor: temp.data.catBgColor }"
-                      style="margin-bottom: 12rpx"
+                      style="margin-bottom: 12rpx;padding-left: 20rpx;"
                       scroll-with-animation
                       :scroll-left="temp.data.scrollLeft"
                       v-bind:class="[theme, 'u-scroll-view', 'dir-left-nowrap']"
@@ -199,6 +193,15 @@
                         {{ catItem.menuName }}
                       </text>
                     </scroll-view>
+					
+					<!-- <scroll-view class="link main-left">
+						<view class="title1" style="margin-right: 61rpx;">荟享自营</view>
+						<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
+						<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
+						<view class="title1" style="margin-right: 61rpx;color: #A7A7A7;">精选类别</view>
+						<image class="tyx" src="https://t17.9026.com/web/statics/image/index/tyx.png" mode=""></image>
+					</scroll-view> -->
+					
                   </template>
                   <app-diy-list
                     :list="temp.data.list"
@@ -488,7 +491,8 @@
                 v-bind:c-padding-bottom="temp.data.c_padding_bottom"
               ></app-video>
             </template>
-
+			
+			<!-- 标题栏 -->
             <template v-else-if="temp.id === 'link'">
               <app-associated-link
                 v-bind:arrows-switch="temp.data.arrowsSwitch"
@@ -1368,10 +1372,10 @@ export default {
   display: inline-block;
   padding-top: 22upx;
   padding-bottom: 7upx;
-  font-size: 32upx;
+  font-size: 26upx;
   margin-right: 52upx;
   white-space: nowrap;
-  border-bottom: 4upx solid transparent;
+  // border-bottom: 4upx solid transparent;
 }
 .u-active-current-round {
   color: white;

+ 10 - 0
src/pages/index/hxj_index_component.vue

xqd
@@ -208,6 +208,16 @@
 		components: {
 			appScrollList
 		},
+		props:{
+			homePages: {
+			  type: Object,
+			  default() {
+			    return {
+			      navs: [],
+			    };
+			  },
+			},
+		},
 		data() {
 			return {
 				swiperKey: 0, //轮播位置

+ 4 - 8
src/pages/index/index.vue

xqd xqd
@@ -26,11 +26,11 @@
 						 :hasHeight="false"
 						 @leftClick="navProperties"
             ></app-nav-bar>
-			<!-- <app-diy-page @buyProduct="buyProduct" v-if="destroy" :page-hide="pageHide" :home-pages="homePages"
+			<app-diy-page @buyProduct="buyProduct" v-if="destroy" :page-hide="pageHide" :home-pages="homePages"
                           :is_storage="is_storage" :theme="getTheme" :page_id="page_id" :is_required="is_required"
-                          :coupon_req="coupon_req"></app-diy-page> -->
+                          :coupon_req="coupon_req"></app-diy-page>
 
-			<hxj-index></hxj-index>
+			<hxj-index :home-pages="homePages"></hxj-index>
 		</template>
 		<!-- <app-buy-prompt :isShowAttention="isShowAttention" v-if="config.is_purchase_frame === 1"></app-buy-prompt> -->
 		<app-attr :goods="attrGoods.goods" :attrGroupList="attrGoods.goods.attr_groups" :theme="getTheme"
@@ -159,11 +159,7 @@
 					},
 					method: 'get'
 				});
-
-				let {
-					code,
-					data
-				} = e;
+				let {code,data} = e;
 				this.$hideLoading();
 				if (code === 0) {
 					this.is_storage = false;

+ 28 - 6
src/pages/order-submit/order-submit.vue

xqd xqd xqd xqd xqd xqd
@@ -3,20 +3,23 @@
 		<view class="safe-area-inset-bottom">
 			<!-- 地址、商户、配送、商品、优惠、费用信息 -->
 			<view class="page" v-if="previewData">
+				<view v-if="getIsEnterSales" @click="navCustomer" class="select-customer" >
+					请选择客户
+				</view>
 				<view v-if="!previewData.hasCity && previewData.show_address !== false && previewData.hasRecipient"
 					class="group">
 					<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
 						:all-ziti="previewData.allZiti" @address-input="handleAddressInput"></app-address-bar>
 				</view>
 				<template v-for="(mch, mchIndex) in previewData.mch_list">
-					<view v-if="previewData.hasCity && mchIndex === 0" class="group xz">
+					<!-- <view v-if="previewData.hasCity && mchIndex === 0" class="group xz">
 						<app-address-bar :address="mch.city.error ? null : mch.address" :has-city="true"
 							:city="mch.city"></app-address-bar>
 					</view>
 					<view v-if="previewData.hasCity && mchIndex === 1" class="group cv">
 						<app-address-bar :address="previewData.address" :has-ziti="previewData.has_ziti"
 							:all-ziti="previewData.allZiti" :city="mch.city"></app-address-bar>
-					</view>
+					</view> -->
 					<view :key="mchIndex" class="group">
 						<!-- 循环商户列表start -->
 						<view style="padding: 26rpx 32rpx;">
@@ -54,7 +57,7 @@
 														class="title-icon mr-12"></image>
 												</view>
 												<view class="font-bold ellipsis-1 mr-12">
-													{{mch.store.name}}
+													{{mch.store.name}}1
 												</view>
 												<view class="mr-12">
 													<image
@@ -102,7 +105,8 @@
 										</view>
 									</view>
 								</template>
-							</template><!-- 自提门店信息end -->
+							</template>
+							<!-- 自提门店信息end -->
 						</view>
 						<view class="line"></view>
 						<!-- 选择配送方式start -->
@@ -578,7 +582,10 @@
 				return this.userTheme ? this.userTheme : this.getTheme;
 			},
 			...mapGetters('mallConfig', {
-				getTheme: 'getTheme',
+				getTheme: 'getTheme'
+			}),
+			...mapGetters('user', {
+				getIsEnterSales: 'getIsEnterSales'
 			}),
 			themeBgClass() {
 				if (this.userTheme && this.userTheme.indexOf('gift') >= 0) {
@@ -667,6 +674,11 @@
 			},
 		},
 		methods: {
+			navCustomer(){
+				uni.navigateTo({
+					url:'/pages/sale/cusmter/list'
+				})
+			},
 			getMall(e) {
 				console.log(e)
 				if (e != undefined) {
@@ -1337,7 +1349,17 @@
 	$borderColor: $uni-weak-color-one;
 	$xWidth: #{24rpx};
 	$yWidth: #{24rpx};
-
+	
+	.select-customer{
+		margin: 20rpx 26rpx;
+		background: #fff;
+		border-radius: 16rpx;
+		overflow: hidden;
+		-webkit-box-shadow: 0 0 5rpx rgba(0,0,0,0.025);
+		box-shadow: 0 0 5rpx rgba(0,0,0,0.025);
+		padding: 25rpx 32rpx;
+	}
+	
 	.page {
 		padding-bottom: $submitBarHeight;
 		font-size: #{28rpx};