Commit c9da0ba8 by huahua

提交

parent 5ca35981
<template> <template>
<view class="full-width full-height" style="background: #FFFFFF; "> <view class="full-width full-height" style="background: #FFFFFF; ">
<!-- 自定义头部 --> <!-- 自定义头部 -->
<myhead :worksid="works_id" :title="titlename" :color="'#131319'" :titleShow="true" :backShow="true" :background="'#fff'"></myhead> <myhead :worksid="works_id" :title="titlename" :color="'#131319'" :titleShow="true" :backShow="true"
:background="'#fff'"></myhead>
<!-- 登录弹框 --> <!-- 登录弹框 -->
<Signin ref="Signin"></Signin> <Signin ref="Signin"></Signin>
...@@ -13,10 +14,11 @@ ...@@ -13,10 +14,11 @@
<!-- 设计区域 --> <!-- 设计区域 -->
<view v-show="!state" class="full-width content-color full-height" :style="{background: design_color }"> <view v-show="!state" class="full-width content-color full-height" :style="{background: design_color }">
<!-- 取消选中 --> <!-- 取消选中 -->
<view class="full-width full-height" style="position: absolute; top: 0; left: 0;" @click.stop="itemCancel"></view> <view class="full-width full-height" style="position: absolute; top: 0; left: 0;" @click.stop="itemCancel">
</view>
<view class="container" @click='itemCancel' @touchmove.stop="touchMove" @touchend.stop="touchEnd"> <view class="container" @click='itemCancel' @touchmove.stop="touchMove" @touchend.stop="touchEnd">
<view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px'}" style="position: relative; "> <view :style="{width: data.bgWidth +'px',height: data.bgHeight +'px'}" style="position: relative; ">
...@@ -458,7 +460,7 @@ ...@@ -458,7 +460,7 @@
<view style="position: relative; width: calc(100% - 40upx); z-index: 99; margin:30upx auto; "> <view style="position: relative; width: calc(100% - 40upx); z-index: 99; margin:30upx auto; ">
<swiper :autoplay="true" :interval="3000" :duration="1000" :indicator-dots="true" <swiper :autoplay="true" :interval="3000" :duration="1000" :indicator-dots="true"
:indicator-active-color="'#ffffff'" :indicator-active-color="'#ffffff'"
style="height: 155upx; width: 100%; border-radius: 10upx; overflow: hidden; margin:auto; margin-top:55upx;"> style="height: 150upx; width: 100%; border-radius: 10upx; overflow: hidden; margin:auto; margin-top:55upx;">
<swiper-item v-for="(item, index) in Adlists" :key="index" class="full-width"> <swiper-item v-for="(item, index) in Adlists" :key="index" class="full-width">
<image :src="item.content + '?x-oss-process=image/resize,lfit,w_375'" <image :src="item.content + '?x-oss-process=image/resize,lfit,w_375'"
mode="aspectFill" class="full-width full-height" mode="aspectFill" class="full-width full-height"
...@@ -467,13 +469,15 @@ ...@@ -467,13 +469,15 @@
</swiper> </swiper>
</view> </view>
<view id="classification" v-if="e_active == 2 || e_active == 23 || e_active == 99" <view id="classification" v-if="e_active == 2 || e_active == 23 || e_active == 99"
style="width: 100%; position: relative; z-index: 99; "> style="width: 100%; position: relative; z-index: 99; " >
<view style="overflow: hidden;" v-if="material_series_list.length > 0"> <view style="overflow: hidden;" v-if="material_series_list.length > 0">
<view <view
@tap="material_series_handleScroll(index,item)"
:class="['material-series-scroll-item', { 'material-series-scroll-item-active': item.id == material_series_currentId }]" :class="['material-series-scroll-item', { 'material-series-scroll-item-active': item.id == material_series_currentId }]"
:id="'s' + index" v-for="(item, index) in material_series_list" :key="index" :id="'s' + index" v-for="(item, index) in material_series_list" :key="index"
@tap="material_series_handleScroll(index,item)"> >
<view>{{item.title}}</view> <view>{{item.title}}</view>
</view> </view>
</view> </view>
...@@ -491,7 +495,7 @@ ...@@ -491,7 +495,7 @@
</view> </view>
</view> </view>
<view v-if="e_active == 0" style="width: 100%; height:100%; opacity: 1;"></view> <!-- <view v-if="e_active == 0" style="width: 100%; height:100%; opacity: 1;"></view> -->
</uni-popup> </uni-popup>
...@@ -1954,6 +1958,7 @@ ...@@ -1954,6 +1958,7 @@
////打开弹框 1模板 2贴图 3字体 4编辑 22添加相框 23壁纸 ////打开弹框 1模板 2贴图 3字体 4编辑 22添加相框 23壁纸
material_series_handleScroll(index, item) { material_series_handleScroll(index, item) {
console.log("点击" + index)
this.queryPage.page = 1 this.queryPage.page = 1
this.material_series_currentId = item.id this.material_series_currentId = item.id
this.queryPage.material_series_id = item.id this.queryPage.material_series_id = item.id
...@@ -3410,9 +3415,9 @@ ...@@ -3410,9 +3415,9 @@
title: "最新" title: "最新"
}, ) }, )
this.Adlists = this.diy_bannerList this.Adlists = this.diy_bannerList
//console.log(this.Adlists) //console.log(this.Adlists)
this.queryPage.goods_id = this.data.goods_id this.queryPage.goods_id = this.data.goods_id
this.brands = this.Material_category this.brands = this.Material_category
this.currentId = this.currentId_Material; this.currentId = this.currentId_Material;
......
<template> <template>
<!-- 贴图 --> <!-- 贴图 -->
<view class="content" style="width: 100%; height: 100%; position: relative; z-index: 999999;" <view class="content" style="width: 100%; height: 100%; position: relative;"
:style="{height: (windowHeight + 80) +'px'}"> :style="{height: (windowHeight - classificationHeight) +'px'}">
<refresh @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished" @scrolltolower="g" <refresh @interrupt="interrupt" @pushToInterrupt="pushToInterrupt" @finished="finished" @scrolltolower="g"
:scrollHeight="(windowHeight + 80 )" :scrollTop="scrollViewTop" @scroll="scroll"> :scrollHeight="(windowHeight - classificationHeight)" :scrollTop="scrollViewTop" @scroll="scroll">
<template slot="top"> <template slot="top">
<view style="color: #FFFFFF;position: absolute; top: 0;width: 100%; text-align: center;" <view style="color: #FFFFFF;position: absolute; top: 0;width: 100%; text-align: center;"
:style="'height:' + 40 + 'px; line-height:' + 40 + 'px;'">{{tip}}</view> :style="'height:' + 40 + 'px; line-height:' + 40 + 'px;'">{{tip}}</view>
......
...@@ -4,7 +4,7 @@ if(!accountInfo.miniProgram.envVersion){ ...@@ -4,7 +4,7 @@ if(!accountInfo.miniProgram.envVersion){
} }
const baseApi = { const baseApi = {
// 开发版 // 开发版
develop: "https://tprint.refinecolor.com", develop: "https://tprint.refinecolor.com",
//develop: "https://tprint.colorpark.cn", //develop: "https://tprint.colorpark.cn",
// 体验版 // 体验版
trial: "https://tprint.refinecolor.com", trial: "https://tprint.refinecolor.com",
......
...@@ -12,7 +12,6 @@ class WxTouchEvent { ...@@ -12,7 +12,6 @@ class WxTouchEvent {
bind(option) { bind(option) {
this.element = null; this.element = null;
this.rotate = wrapFunc(this.element, option.rotate || noop); this.rotate = wrapFunc(this.element, option.rotate || noop);
this.touchStart = wrapFunc(this.element, option.touchStart || noop); this.touchStart = wrapFunc(this.element, option.touchStart || noop);
this.multipointStart = wrapFunc(this.element, option.multipointStart || noop); this.multipointStart = wrapFunc(this.element, option.multipointStart || noop);
...@@ -27,7 +26,6 @@ class WxTouchEvent { ...@@ -27,7 +26,6 @@ class WxTouchEvent {
this.touchMove = wrapFunc(this.element, option.touchMove || noop); this.touchMove = wrapFunc(this.element, option.touchMove || noop);
this.touchEnd = wrapFunc(this.element, option.touchEnd || noop); this.touchEnd = wrapFunc(this.element, option.touchEnd || noop);
this.touchCancel = wrapFunc(this.element, option.touchCancel || noop); this.touchCancel = wrapFunc(this.element, option.touchCancel || noop);
this.delta = null; this.delta = null;
this.last = null; this.last = null;
this.now = null; this.now = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment