Skip to content

W
wechat_currency
Commit 6dd96383 by huahua
Options

提交

parent 9a1b6f15
Showing with 44 additions and 62 deletions
pages/index/index.vue
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
</block> </block>
</view> </view>
</view> </view>
<!-- 操作列表 --> <!-- 操作列表 -->
<view v-if="editory" class='operate-list' style="z-index: 10;" <view v-if="editory" class='operate-list' style="z-index: 10;"
:style="{width: data.editorWidth +'px',height: data.editorHeight +'px',top: editory +'px'}"> :style="{width: data.editorWidth +'px',height: data.editorHeight +'px',top: editory +'px'}">
...@@ -3953,7 +3954,7 @@ ...@@ -3953,7 +3954,7 @@
} }
}, },
async text_awaitone(content) { async text_awaitone(content) {
// 获取当前选中的部件 //获取当前选中的部件
if (content == '' || content == null) { if (content == '' || content == null) {
var item = items[index]; var item = items[index];
if (item != null) { if (item != null) {
...@@ -3984,7 +3985,7 @@ ...@@ -3984,7 +3985,7 @@
item.height = item.height * rate; item.height = item.height * rate;
item.top = item.y - (item.height / 2); item.top = item.y - (item.height / 2);
} }
// that.setData({itemList:items}); //that.setData({itemList:items});
that.setData({ that.setData({
data: that.data data: that.data
}) })
...@@ -4412,10 +4413,8 @@ ...@@ -4412,10 +4413,8 @@
} }
var newScale = Math.max(e.scale * item.lastScale, .01); var newScale = Math.max(e.scale * item.lastScale, .01);
newScale || (newScale = item.lastScale); newScale || (newScale = item.lastScale);
//角度
item.rotate += e.angle; item.rotate += e.angle;
item.angle = item.rotate; item.angle = item.rotate;
//缩放
item.scale = newScale; item.scale = newScale;
//图片放大响应的右下角按钮同比缩小 //图片放大响应的右下角按钮同比缩小
item.oScale = 1 / item.scale; item.oScale = 1 / item.scale;
...@@ -4468,8 +4467,7 @@ ...@@ -4468,8 +4467,7 @@
this.is_recommend = res.is_recommend this.is_recommend = res.is_recommend
this.is_home = res.is_home this.is_home = res.is_home
//console.log(this.diy_upload_menu);
//console.log(this.is_public);
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.msg, title: err.msg,
...@@ -4528,6 +4526,7 @@ ...@@ -4528,6 +4526,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -4588,7 +4587,7 @@ ...@@ -4588,7 +4587,7 @@
// outline: 0.5upx solid #4EE2AE; // outline: 0.5upx solid #4EE2AE;
} }
/* 删除、缩放、旋转操作按钮 */ /*删除、缩放、旋转操作按钮 */
.rotate, .rotate,
.rotate-red, .rotate-red,
.scale, .scale,
...@@ -4786,8 +4785,6 @@ ...@@ -4786,8 +4785,6 @@
z-index: 99; z-index: 99;
top: 4upx; top: 4upx;
width: 40upx; width: 40upx;
/* height: 6upx;
background: #5CE6B5; */
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
...@@ -4810,14 +4807,12 @@ ...@@ -4810,14 +4807,12 @@
z-index: 99; z-index: 99;
bottom: 4upx; bottom: 4upx;
width: 40upx; width: 40upx;
/* height: 6upx;
background: #5CE6B5; */
left: 0; left: 0;
right: 0; right: 0;
margin: auto; margin: auto;
} }
// 上一步、下一步按钮 //上一步、下一步按钮
.operation { .operation {
display: flex; display: flex;
justify-items: center; justify-items: center;
......
pages/index/machineDetail.vue
...@@ -76,7 +76,8 @@ ...@@ -76,7 +76,8 @@
</view> </view>
<switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods> <switchGoods ref="switchGoods" @selectGoodItem="selectGoodItem"></switchGoods>
<!--//商品弹框 --> <!--商品弹框 -->
</view> </view>
</template> </template>
...@@ -123,8 +124,7 @@ ...@@ -123,8 +124,7 @@
}, },
methods: { methods: {
//调转代理小程序 //调转代理小程序
toProxyApplet() { toProxyApplet() {
var url = Env.getBaseURL(); var url = Env.getBaseURL();
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
} }
}) })
}, },
//首次进来检查是否 //首次进来检查是否
toFirstCheck() { toFirstCheck() {
...@@ -338,9 +337,8 @@ ...@@ -338,9 +337,8 @@
this.myheadtext = this.machine_id + "-定制"; this.myheadtext = this.machine_id + "-定制";
this.$base.machine_id = this.machine_id this.$base.machine_id = this.machine_id
this.statusloading = 1; this.statusloading = 1;
this.Adlist() //轮播图 this.Adlist() //轮播图
this.getDetail() //获取数据 this.getDetail() //获取数据
let url = "/api/material/mchineFontFamilyList"; let url = "/api/material/mchineFontFamilyList";
let queryParam = { let queryParam = {
machine_id: this.machine_id machine_id: this.machine_id
...@@ -379,8 +377,9 @@ ...@@ -379,8 +377,9 @@
textlist.textlong = false textlist.textlong = false
}, },
complete(res) { complete(res) {
//console.log("完成")
textlist.long = true textlist.long = true
textlist.remark = textlist.remark
textlist.textlong = true
that.globalData.typefacedata.forEach(item => { that.globalData.typefacedata.forEach(item => {
if (item.long == true) { if (item.long == true) {
that.globalData.num++ that.globalData.num++
...@@ -391,12 +390,12 @@ ...@@ -391,12 +390,12 @@
} }
that.globalData.num = 0 that.globalData.num = 0
} }
}) })
}) })
}).catch(err => { }).catch(err => {
//uni.hideLoading(); //uni.hideLoading();
}); });
}, },
onShow() {}, onShow() {},
......
pages/index/mall.vue
<template> <template>
<view class="full-width"> <view class="full-width">
<!-- 登录弹框 --> <!-- 登录弹框 -->
<Signin ref="Signin"></Signin> <Signin ref="Signin"></Signin>
<!-- 自定义头部 --> <!-- 自定义头部 -->
<view class='flex commonHead' style="height: 100upx;" :style="{height: titleHeight +'px'}"> <view class='flex commonHead' style="height: 100upx;" :style="{height: titleHeight +'px'}">
<view class='commonHead-wrap flex'> <view class='commonHead-wrap flex'>
<view class='commonHead_left' @click="tomine()"> <!--<view class='commonHead_left' @click="tomine()">
<view class='commonHead_left_back'> <view class='commonHead_left_back'>
<view class="commonHead_left_back_img"> <view class="commonHead_left_back_img">
<image src="../../static/icon_mall_zuoshang.png" style="width: 50upx; <image src="../../static/icon_mall_zuoshang.png" style="width: 50upx;
...@@ -15,7 +13,7 @@ ...@@ -15,7 +13,7 @@
margin-top: 10upx; " mode="aspectFill"></image> margin-top: 10upx; " mode="aspectFill"></image>
</view> </view>
</view> </view>
</view> </view>-->
<view class='commonHead_right flex'> <view class='commonHead_right flex'>
<view class='commonHead_right_text line1'>色彩小商品</view> <view class='commonHead_right_text line1'>色彩小商品</view>
</view> </view>
...@@ -29,12 +27,9 @@ ...@@ -29,12 +27,9 @@
<view class="start_title" style="margin-top: 60upx; color: #FFFFFF; width: 100%; text-align: center;">定制站必须扫码才能使用</view> <view class="start_title" style="margin-top: 60upx; color: #FFFFFF; width: 100%; text-align: center;">定制站必须扫码才能使用</view>
</view> </view>
</view> </view>
<view @click="scan1" style="width: 460upx; position: fixed; bottom: 100upx; margin: auto; <view @click="scan1" style="width: 460upx; position: fixed; bottom: 100upx; margin: auto; height: 164upx; background: #47E5E5; left: 0; right: 0; z-index: 99; border-radius: 20upx; display: flex; align-items: center;">
height: 164upx; background: #47E5E5; left: 0; right: 0; z-index: 99; border-radius: 20upx; display: flex; align-items: center;"> <view style="width: 120upx; height: 120upx;border-radius: 50%; margin: 22upx 30upx;text-align: center;">
<view style="width: 120upx; <image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png" mode=""></image>
height: 120upx;border-radius: 50%; margin: 22upx 30upx;text-align: center;">
<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png"
mode=""></image>
</view> </view>
<view style="color: #000; font-size: 36upx;">开始扫码定制</view> <view style="color: #000; font-size: 36upx;">开始扫码定制</view>
</view> </view>
...@@ -46,21 +41,16 @@ ...@@ -46,21 +41,16 @@
<view style="width: 690upx; margin:0upx auto 30upx; display: flex;"> <view style="width: 690upx; margin:0upx auto 30upx; display: flex;">
<view> <view>
<view style="position: relative; width: 320upx; height: 160upx;" @click="order()"> <view style="position: relative; width: 320upx; height: 160upx;" @click="order()">
<image src="../../static/mine/dingdan@3x.png" mode="" <image src="../../static/mine/dingdan@3x.png" mode="" style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image>
style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image> <view style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #FFFFFF;font-weight: bold;">订单</view>
<view
style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #FFFFFF;font-weight: bold;">
订单</view>
<view style="margin-top: 15upx;margin-left:26upx;font-size: 24upx; <view style="margin-top: 15upx;margin-left:26upx;font-size: 24upx;
font-weight: 400; color: #FFFFFF;">我的定制</view> font-weight: 400; color: #FFFFFF;">我的定制</view>
</view> </view>
<view style="margin-top: 16upx; position: relative;width: 320upx; height: 160upx;" <view style="margin-top: 16upx; position: relative;width: 320upx; height: 160upx;"
@click="coupons()"> @click="coupons()">
<image src="../../static/mine/huayihua@3x.png" mode="" <image src="../../static/mine/huayihua@3x.png" mode=""
style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image> style="width: 320upx; height: 160upx; position: absolute;z-index: -1;"></image>
<view <view style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #FFFFFF;font-weight: bold;">滑一滑</view>
style="margin-left:26upx; padding-top: 27upx; font-size: 36upx; color: #FFFFFF;font-weight: bold;">
滑一滑</view>
</view> </view>
</view> </view>
<view style="margin-left: 15upx;width: 350upx; height: 340upx;" @click="tomine()"> <view style="margin-left: 15upx;width: 350upx; height: 340upx;" @click="tomine()">
...@@ -77,14 +67,12 @@ ...@@ -77,14 +67,12 @@
<view style="font-size: 36upx; margin-top: 40upx; margin-left: 40upx; font-weight: bold; color: #FFFFFF;">在线定制站</view> <view style="font-size: 36upx; margin-top: 40upx; margin-left: 40upx; font-weight: bold; color: #FFFFFF;">在线定制站</view>
<view style="width: 690upx; margin: 30upx auto 0; background: #131319; border-radius: 10upx;"> <view style="width: 690upx; margin: 30upx auto 0; background: #131319; border-radius: 10upx;">
<view v-for="(item, index) in LoupanList" :key="index" @click="goMachineDetail(item)"> <view v-for="(item, index) in LoupanList" :key="index" @click="goMachineDetail(item)">
<view v-if="index != 0" style="width: 689upx; height: 1upx; background: #CCCCCC; opacity: 0.1;"> <view v-if="index != 0" style="width: 689upx; height: 1upx; background: #CCCCCC; opacity: 0.1;"></view>
</view>
<view style="height: 160upx; display: flex; align-items: center; padding: 29upx 20upx 30upx 19upx;"> <view style="height: 160upx; display: flex; align-items: center; padding: 29upx 20upx 30upx 19upx;">
<image <image
style="width: 150upx; height: 143upx; margin: 0upx 21upx 0upx 0upx; border-radius: 10upx;" style="width: 150upx; height: 143upx; margin: 0upx 21upx 0upx 0upx; border-radius: 10upx;"
mode="aspectFill" :src="item.image + '?x-oss-process=image/resize,lfit,w_164'"></image> mode="aspectFill" :src="item.image + '?x-oss-process=image/resize,lfit,w_164'"></image>
<view style="width: calc(100% - 281upx);"> <view style="width: calc(100% - 281upx);">
<view style="font-size: 36upx; font-weight: 500; color: #FFFFFF; opacity: 0.4;"> <view style="font-size: 36upx; font-weight: 500; color: #FFFFFF; opacity: 0.4;">
{{item.id}} {{item.id}}
</view> </view>
...@@ -98,8 +86,7 @@ ...@@ -98,8 +86,7 @@
</view> </view>
</view> </view>
<view style="width: 170upx;"> <view style="width: 170upx;">
<text class="statuslist" <text class="statuslist" style="background:#5FE4B6;">体验中</text>
style="background:#5FE4B6;">体验中</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -312,7 +299,7 @@ ...@@ -312,7 +299,7 @@
}, },
envVersion: envVersionName, envVersion: envVersionName,
success(res) { success(res) {
// 打开成功 //打开成功
} }
}) })
}, },
...@@ -323,8 +310,7 @@ ...@@ -323,8 +310,7 @@
if (url.indexOf("colorpark") != -1) { if (url.indexOf("colorpark") != -1) {
envVersionName = "release"; envVersionName = "release";
} }
//console.log("envVersionName="+envVersionName); uni.navigateToMiniProgram({
wx.navigateToMiniProgram({
appId: Env.getappId(), appId: Env.getappId(),
path: '/pages/index/recommend?selectTitleType=2', path: '/pages/index/recommend?selectTitleType=2',
extraData: { extraData: {
...@@ -350,28 +336,30 @@ ...@@ -350,28 +336,30 @@
} }
}) })
}, },
// 防止重复点击
//防止重复点击
touchStart(e) { touchStart(e) {
this.touchStartTime = e.timeStamp; this.touchStartTime = e.timeStamp;
}, },
touchEnd(e) { touchEnd(e) {
this.touchEndTime = e.timeStamp; this.touchEndTime = e.timeStamp;
}, },
doubleTap(e) { doubleTap(e) {
// 控制点击事件在350ms内触发，加这层判断是为了防止长按时会触发点击事件 // 控制点击事件在350ms内触发，加这层判断是为了防止长按时会触发点击事件
if (this.touchEndTime - this.touchStartTime < 350) { if (this.touchEndTime - this.touchStartTime < 350) {
// 当前点击的时间 //当前点击的时间
const currentTime = e.timeStamp; const currentTime = e.timeStamp;
const lastTapTime = this.lastTapTime; const lastTapTime = this.lastTapTime;
// 更新最后一次点击时间 //更新最后一次点击时间
this.lastTapTime = currentTime; this.lastTapTime = currentTime;
// 如果两次点击时间在300毫秒内，则认为是双击事件 //如果两次点击时间在300毫秒内，则认为是双击事件
if (currentTime - lastTapTime > 300) { if (currentTime - lastTapTime > 300) {
// console.log('防止重复点击') //console.log('防止重复点击')
if (!this.$AppContext.checkLogin()) { if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo') this.tologo('navigateTo')
} else { } else {
//this.showOrHide()
//uni.navigateTo({url: '/pages/index/index?goods_id=21'}) //uni.navigateTo({url: '/pages/index/index?goods_id=21'})
uni.navigateTo({ uni.navigateTo({
url: '../index/machineDetail?machine_id=' + this.$Env.getmachineId() + '&worksid=0' url: '../index/machineDetail?machine_id=' + this.$Env.getmachineId() + '&worksid=0'
...@@ -422,7 +410,7 @@ ...@@ -422,7 +410,7 @@
success(res) { success(res) {
that.getLocation() that.getLocation()
}, },
// 授权失败 //授权失败
fail(err) { fail(err) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
......
pages/index/shapeScrollView.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
src="../../static/icon/diy_icon_remove_normal.png" mode=""></image> src="../../static/icon/diy_icon_remove_normal.png" mode=""></image>
</view> </view>
<view v-else :style="{'mask-image':' url(' + item.image + '?x-oss-process=image/resize,lfit,w_112)','-webkit-mask-image':' url(' + item.image + '?x-oss-process=image/resize,lfit,w_112)',}" <view v-else :style="{'mask-image':' url(' + item.image + '?x-oss-process=image/resize,lfit,w_112)','-webkit-mask-image':' url(' + item.image + '?x-oss-process=image/resize,lfit,w_112)',}"
style="width: 100%; height: 100%; overflow: hidden; mask-size: 80%; -webkit-mask-size: 80%;mask-repeat:no-repeat;-webkit-mask-repeat: no-repeat;"> style="width: 100%; height: 100%; overflow: hidden; mask-size: 80%; -webkit-mask-size: 80%;mask-repeat:no-repeat;-webkit-mask-repeat: no-repeat;">
<image style="width: 148.5upx; height: 204.6upx; margin: auto;" :src="item.compose_image + '?x-oss-process=image/resize,lfit,w_112'" <image style="width: 148.5upx; height: 204.6upx; margin: auto;" :src="item.compose_image + '?x-oss-process=image/resize,lfit,w_112'"
mode="aspectFill"></image> mode="aspectFill"></image>
</view> </view>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</view> </view>
</view> </view>
<view class="align-center" style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);" <view class="align-center" style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);"
v-if="datalist.length == 0"> v-if="datalist.length == 0">
<span class="iconfont icon-wushuju" style="font-size: 100upx; text-align: center; color: #B2B2B2;"></span> <span class="iconfont icon-wushuju" style="font-size: 100upx; text-align: center; color: #B2B2B2;"></span>
<view style="color: #B2B2B2; text-align: center; line-height: 50upx;font-size: 24upx;">啊嘞，还是一片荒漠</view> <view style="color: #B2B2B2; text-align: center; line-height: 50upx;font-size: 24upx;">啊嘞，还是一片荒漠</view>
</view> </view>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</template> </template>
<template slot="bottom"> <template slot="bottom">
<view> <view>
没有更多数据了 没有更多数据了
</view> </view>
</template> </template>
</refresh> </refresh>
......
util/Env.js
...@@ -4,8 +4,8 @@ if(!accountInfo.miniProgram.envVersion){ ...@@ -4,8 +4,8 @@ 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",
// trial: "https://tprint.colorpark.cn", // trial: "https://tprint.colorpark.cn",
......
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