Skip to content

W
wechat_baking
Commit 44af7cee by huahua
Options

提交

parent f77e3f66
Showing with 241 additions and 272 deletions
.hbuilderx/launch.json 0 → 100644
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"default" :
{
"launchtype" : "local"
},
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}
api/UserApi.js
......@@ -7,4 +7,4 @@ import {
* 登录
* @param {*} params
*/
export const _login = (params = {}) => _request({url: '/lite/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
export const _login = (params = {}) => _request({url: '/baking/index', params, method: 'post', contentType: Enums.ContentType.FORM_UTF8})
api/homeApi.js
......@@ -8,8 +8,8 @@ import {
*
* @param {*} params
*/
export const route = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true})
export const route = (params = {}) => _request({url: '/baking/index', params, method: 'post',token: true})
export const route_timeout = (params = {}) => _request({url: '/lite/index', params, method: 'post',token: true,timeout: true})
export const route_timeout = (params = {}) => _request({url: '/baking/index', params, method: 'post',token: true,timeout: true})
export const newroute = (params = {}) => _request({url: '/lite/index/index', params, method: 'post',token: true})
\ No newline at end of file
export const newroute = (params = {}) => _request({url: '/lite/baking/index/index', params, method: 'post',token: true})
\ No newline at end of file
components/cropper/readme.md
......@@ -75,5 +75,6 @@ page {
--safe-area-inset-bottom: env(safe-area-inset-bottom);
--safe-area-inset-left: env(safe-area-inset-left);
}
}
```
\ No newline at end of file
components/fr-image/fr-image.vue
......@@ -49,8 +49,7 @@
default: false,
},
// 可选： 加载失败图片：可以本地url、网络url、base64 （与src一致）
//可选： 加载失败图片：可以本地url、网络url、base64 （与src一致）
loadingErrorImg: {
type: String,
default: require('./loading_error.png'),
......
components/mpvue-citypicker/mpvueCityPicker.vue
......@@ -34,7 +34,7 @@ export default {
provinceDataList: [],
cityDataList: [],
areaDataList: [],
/* 是否显示控件 */
/*是否显示控件 */
showPicker: false,
};
},
......
components/toolbar/toolbar.vue
......@@ -31,15 +31,9 @@
</view>
<view class="pen-section">
<view style="display: flex; align-items: center; justify-content: center;">
<!-- <view class="pen" :style="{backgroundColor: penColor, height: lineWidth}"></view>
<view class="triangle-right"
:style="{'border-top': (lineValue / 2) + 'px solid transparent',
'border-left': lineValue + 'px solid' + penColor,
'border-bottom': (lineValue / 2) + 'px solid transparent',}"></view> -->
<view style="font-size: 25upx; margin-right: 16upx; color: #FFFFFF;">画笔大小</view>
</view>
<slider min="1" max="20" :value="lineValue" block-size="25" activeColor="#FFFFFF" class="pen-slider" @change="penWidthChange"/>
<!-- <view class="pen-txt">{{lineWidth}}</view> -->
</view>
</view>
</template>
......
components/uni-calendar/calendar.js
......@@ -13,7 +13,6 @@
*/
/* eslint-disable */
var calendar = {
/**
* 农历1900-2100的润大小信息表
* @Array Of Property
......
components/uni-calendar/util.js
......@@ -21,8 +21,8 @@ class Calendar {
this.cleanMultipleStatus()
// 每周日期
this.weeks = {}
// this._getWeek(this.date.fullDate)
}
/**
* 设置日期
* @param {Object} date
......@@ -49,7 +49,6 @@ class Calendar {
resetSatrtDate(startDate) {
// 范围开始
this.startDate = startDate
}
/**
......@@ -98,7 +97,6 @@ class Calendar {
}
}
/**
* 获取上月剩余天数
*/
......@@ -115,6 +113,7 @@ class Calendar {
}
return dateArr
}
/**
* 获取本月天数
*/
......@@ -123,9 +122,7 @@ class Calendar {
let fullDate = this.date.fullDate
for (let i = 1; i <= dateData; i++) {
let isinfo = false
let nowDate = full.year + '-' + (full.month < 10 ?
full.month : full.month) + '-' + (i < 10 ?
'0' + i : i)
let nowDate = full.year + '-' + (full.month < 10 ?full.month : full.month) + '-' + (i < 10 ?'0' + i : i)
// 是否今天
let isDay = fullDate === nowDate
// 获取打点信息
......@@ -135,7 +132,7 @@ class Calendar {
}
})
// 日期禁用
//日期禁用
let disableBefore = true
let disableAfter = true
if (this.startDate) {
......@@ -180,6 +177,7 @@ class Calendar {
}
return dateArr
}
/**
* 获取下月天数
*/
......@@ -238,7 +236,6 @@ class Calendar {
}
}
/**
* 获取日期范围内所有日期
* @param {Object} begin
......@@ -260,12 +257,14 @@ class Calendar {
}
return arr
}
/**
* 计算阴历日期显示
*/
getlunar(year, month, date) {
return CALENDAR.solar2lunar(year, month, date)
}
/**
* 设置打点
*/
......
components/uni-fab/uni-fab.vue
......@@ -45,7 +45,6 @@
// #ifdef APP-NVUE
platform = uni.getSystemInfoSync().platform
// #endif
/**
* Fab 悬浮按钮
* @description 点击可展开一个图形按钮菜单
......
components/xing-refresh/完全自定义的带有下拉刷新的scroll-view组件.md
## 完全自定义的带有下拉刷新的scroll-view组件
## 完全自定义的带有下拉刷新的scroll-view组件
......@@ -38,7 +38,7 @@ upRefresh: {
​ moveMax: {
​ //可下拉的最大距离 指手指滑动的距离(px) 超出后会被截断 此时下拉框已经完全显示 即已经到达
//下面属性topHeight的高度
//下面属性topHeight的高度
​ type: Number,
......
pages/index/machineDetail.vue
......@@ -21,21 +21,16 @@
style="width: 15upx; height: 15upx; margin-left: 10upx;"></image>
<image else src="../../static/icon_banner_select_dot.png"
style="width: 15upx; height: 15upx; margin-left: 10upx;"></image>
<!-- <view class="dot iconfont"
:class="[index == currentSwiper ? 'iconsanjiaoxing':'iconxingzhuang-sanjiaoxing' ]">
</view> -->
</view>
</view>
</view>
<view @click="Customize_now" hover-class="hover-class-bg" style="position: fixed; bottom: 130upx; left: 0; right: 0; margin: auto;
width: 300upx; height: 100upx;
background: linear-gradient(92deg, #F29F3D, #67C4CA);
background: linear-gradient(92deg, #E6B01A, #F29F3D);
box-shadow: 0px 19px 48px 1px rgba(20, 31, 62, 0.35);
border-radius: 40px;">
<view
style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">
立即定制</view>
<view style=" text-align: center; line-height: 100upx; font-size: 36upx; font-weight: 500; color: #FFFFFF;">立即定制</view>
</view>
</view>
......@@ -66,7 +61,7 @@
<Signin ref="Signin"></Signin>
<view v-if="statusloading == 1" @tap="toLineList"
style="position: fixed; z-index: 99; right: 0; bottom: 200upx; width: 109upx; height: 123upx;">
style="position: fixed; z-index: 99; right: 0; bottom: 300upx; width: 109upx; height: 123upx;">
<image src="../../static/liebiao.png" mode="" style="width: 243upx; height: 123upx;"></image>
</view>
......@@ -126,9 +121,11 @@
//选择商品进来
selectGoodItem(item) {
uni.navigateTo({
url: '../index/index?machine_id=' + this.machine_id + "&good_id=" + item.id,
url: '../index/index?machine_id=' + this.machine_id + "&good_id=" + item.id + "&title=" + item.title + "&real_width=" + item.key,
})
},
//立即定制
......@@ -170,12 +167,12 @@
uni.login({
provider: 'weixin',
success: (res) => {
//console.log(res)
userService.login({
s: 'Init.init',
code: res.code
}).then(r => {
that.getDetail();
//console.log("进来")
//that.getDetail();
if (type == 1) {
that.$refs['switchGoods'].open(that.machine_id);
} else {
......@@ -281,6 +278,7 @@
this.$base.machine_id = this.machine_id
this.statusloading = 1;
this.Adlist() // 轮播图
//this.getDetail();
},
onShow() {},
......
pages/index/mall.vue
<template>
<view class="full-width full-height">
<!-- v-if="system_config.golf_diy.value == 0" -->
<!-- v-if="system_config.golf_diy.value == 0" -->
<view v-if="system_config.lite_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
<view v-if="system_config.baking_diy.value == 0" @tap="doubleTap" @touchstart="touchStart" @touchend="touchEnd"
style="position: fixed; z-index: 99; right: 0; bottom: 524upx; display: flex;align-items: center;justify-content: center;
width: 100upx; height: 88upx; background: #43cf7c; border-radius: 44upx 0px 0px 44upx;">
width: 100upx; height: 88upx; background: #F29F3D; border-radius: 44upx 0px 0px 44upx;">
<view style="font-size: 24upx; font-weight: 800; color: #FFFFFF;">
<view>定制</view>
<view>体验</view>
......@@ -21,13 +20,14 @@
<!-- 扫码定制 -->
<view @click="scanning" style="width: 460upx; position: fixed; bottom: 180upx; margin: auto;
height: 164upx; background: #FAD9B1 ; left: 0; right: 0; z-index: 99; border-radius: 20upx;
height: 164upx; background: #F5DFA4 ;left: 0; right: 0; z-index: 99; border-radius: 20upx;
display: flex; align-items: center;">
<view style="background: #FFFFFF;width: 120upx;
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>
<image style="height: 61upx; width: 61upx;margin:32upx auto;" src="../../static/icon_saoyisao.png"
mode=""></image>
</view>
<view style="color: #333333 ; font-weight: bold;font-size: 33upx;">开始扫码定制</view>
<view style="color: #333333 ; font-weight: bold;font-size: 34upx;">开始扫码定制</view>
</view>
<!-- 登录弹框 -->
<Signin ref="Signin"></Signin>
......@@ -57,100 +57,7 @@
};
},
methods: {
// Uploadpictures(){
// var that = this
// wx.chooseMessageFile({
// count: 1,
// type: 'image',
// success(res) {
// console.log(res);
// // tempFilePath可以作为img标签的src属性显示图片
// let tempFilePaths = [];
// res.tempFiles.forEach(item => {
// tempFilePaths.push(item.path)
// })
// var size = res.tempFiles[0].size;
// var path = res.tempFiles[0].path;
// var formatImage = path.split(".")[(path.split(".")).length - 1];
// if (formatImage != "png" && formatImage != "jpg" && formatImage != "jpeg") {
// return wx.showToast({
// title: '只能上传.png、.jpg、.jpep 格式',
// icon: 'none',
// image: '',
// duration: 2000,
// mask: true,
// })
// }
// that.uploadDIY(tempFilePaths, 0, 0, 0, tempFilePaths.length);
// }
// })
// },
/* 函数描述：作为上传文件时递归上传的函数体体；
* 参数描述：
* filePaths是文件路径数组
* successUp是成功上传的个数->0
* failUp是上传失败的个数->0
* i是文件路径数组的指标->0
* length是文件路径数组的长度
* machine_id=user_id=
*/
// uploadDIY(tempFilePaths, successUp, failUp, i, length) {
// let machine_id = this.machine_id || 0
// let user_id = userService.getUserInfo().id || 0
// var _this = this
// wx.request({
// url: this.$Env.getDevBaseURL() + '/api/AliossSign/getSign?machine_id=' + machine_id + '&user_id=' + user_id,
// method: 'GET',
// data:'',
// header: {
// 'content-type':'application/x-www-form-urlencoded',
// 'Accept': 'application/json'
// },
// success: function (res) {
// //这里是进度条
// _this.percent = 0
// var atter = res.data
// let time = new Date().getTime() + Math.floor((Math.random() * 1000) + 1)
// var uploadTask = wx.uploadFile({
// url: atter.host.replace("http:", "https:"),
// filePath: tempFilePaths[i],
// name: 'file',
// formData: {
// 'key': atter.dir + time + '.jpg',
// 'OSSAccessKeyId': atter.accessid,
// 'policy': atter.policy,
// 'Signature': atter.signature,
// 'success_action_status': '200',
// 'callback':atter.callback,
// },
// success: function(res) {
// successUp++;
// if (res.statusCode != 200) {
// // console.log({errCode: '599', msg:'其他错误'})
// return;
// }
// if (res.statusCode == 200){
// _this.percent = 100
// uni.showToast({ title: '上传成功', icon: 'none',duration: 3000 })
// console.log(atter.host + '/' + atter.dir + time + '.jpg')
// }
// },
// fail: function(err) {
// failUp++;
// wx.showToast({title: '上传失败！',icon: 'none',duration: 1200})
// },
// complete: function(err) {
// console.log('总共' + successUp + '张上传成功,' + failUp + '张上传失败！');
// }
// })
// uploadTask.onProgressUpdate((res) => {
// console.log('上传进度', res.progress + " " + new Date())
// console.log('已经上传的数据长度', res.totalBytesSent)
// console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
// })
// }
// })
// },
getQueryString(url, name) {
var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
var r = url.substr(1).match(reg)
......@@ -159,6 +66,7 @@
}
return null;
},
scanning() {
if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo')
......@@ -173,9 +81,10 @@
success: function(res) {
console.log(res)
if (res.scanType == 'QR_CODE') {
if (that.getQueryString(res.result, 'machine_id')) {
if (that.getQueryString(res.result, 'machine_id') && that.getQueryString(res.path, 'machine_id') != "" && that.getQueryString(res.result, 'machine_id') != null && that.getQueryString(res.result,'machine_id') != "null") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + that.getQueryString(
url: '../index/machineDetail?machine_id=' + that
.getQueryString(
res.result, 'machine_id')
});
} else {
......@@ -187,7 +96,8 @@
}
} else {
if (res.path) {
if (that.getQueryString(res.path, 'machine_id')) {
if (that.getQueryString(res.path, 'machine_id') && that.getQueryString(res.path, 'machine_id') != "" && that.getQueryString(res
.result, 'machine_id') != null && that.getQueryString(res.result,'machine_id') != "null") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + that
.getQueryString(res.path, 'machine_id')
......@@ -214,7 +124,7 @@
});
}
},
// 防止重复点击
//防止重复点击
touchStart(e) {
this.touchStartTime = e.timeStamp;
},
......@@ -222,7 +132,6 @@
this.touchEndTime = e.timeStamp;
},
doubleTap(e) {
//console.log("doubleTap=");
// 控制点击事件在350ms内触发，加这层判断是为了防止长按时会触发点击事件
if (this.touchEndTime - this.touchStartTime < 350) {
// 当前点击的时间
......@@ -235,13 +144,11 @@
if (!this.$AppContext.checkLogin()) {
this.tologo('navigateTo')
} else {
//console.log("进来=");
if (this.$Env.getmachineId() && this.$Env.getmachineId() != "") {
uni.navigateTo({
url: '../index/machineDetail?machine_id=' + this.$Env.getmachineId()
});
//uni.navigateTo({
// url: '../index/index',
//})
}
}
}
}
......@@ -259,8 +166,7 @@
}).then(r => {
if (e == 'navigateTo') {
uni.navigateTo({
url: '../mall/machineDetail?machine_id=' + that.$Env
.getmachineId() + '&worksid=0'
url: '../mall/machineDetail?machine_id=' + that.$Env.getmachineId() + '&worksid=0'
});
}
}).catch(err => {
......@@ -282,7 +188,6 @@
method: 'GET',
data: {},
header: {
//设置参数内容类型为x-www-form-urlencoded
'content-type': 'application/x-www-form-urlencoded',
'Accept': 'application/json'
},
......@@ -302,7 +207,7 @@
})
}
},
// 下拉加载
//下拉加载
onPullDownRefresh() {
uni.showLoading({
title: '正在刷新中...',
......@@ -310,11 +215,11 @@
})
this.systemConfig()
},
// 上拉加载
//上拉加载
onReachBottom() {},
// 滑动
//滑动
onPageScroll(t) {},
// 分享好友
//分享好友
onShareAppMessage() {
return {
title: this.$Env.getmalltext(),
......@@ -323,7 +228,7 @@
success: (res) => {},
}
},
// 分享朋友圈
//分享朋友圈
onShareTimeline() {
return {
title: this.$Env.getmalltext(),
......@@ -340,10 +245,6 @@
}
},
onShow() {
// let sys = this.$base.appInformation ? this.$base.appInformation:wx.getSystemInfoSync();// 自定义页头适配
// pixelRationum = sys.windowWidth / 375
// let navBarHeight = sys.screenHeight - sys.windowHeight - sys.statusBarHeight;
// this.titleHeight = sys.statusBarHeight + 46
this.systemConfig()
}
};
......
pages/index/scrollView.vue
......@@ -17,7 +17,6 @@
style="width: 139upx; height: 255upx; margin: auto; border-radius: 14px; overflow: hidden;"
:src="(item.image ? item.image:item.url) + '?x-oss-process=image/resize,lfit,w_112'"
mode="aspectFit"></image>
</view>
</view>
<view class="align-center"
......@@ -77,7 +76,6 @@
historyQueryPage: {
goods_id: "", //产品Id
s: 'Works.myList',
}, //历史对象
datalist: [], //作品、贴图列表
......
pages/index/shapeScrollView.vue
......@@ -124,7 +124,7 @@
}
this.getShapeList()
},
// 模板形状列表
//模板形状列表
getShapeList(){
console.log(this.windowHeight)
this.datalist = []
......
pages/index/switchGoods.vue
<template>
<view v-if="isShow"
style=" position: absolute; top: 0; width: 100%; height: 100%; display: flex; flex-direction: column; "
@click="closeView()">
<view v-if="isShow" style=" width: 100%; height: 100%; ">
<view
style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index: 999; opacity: 0.5; ">
style="position: absolute; top: 0; width: 100%; height: 100%; background: #999999; z-index:997; opacity: 0.5; "
@click="closeView()">
</view>
<view style=" position: absolute;
top: calc(50% - 620upx);
height: 1250upx;
width: 100%;
margin:auto;
display: flex;
flex-direction: column;
justify-content: center;
z-index: 999;">
<scroll-view scroll-y scroll-with-animation style="box-sizing: border-box;white-space: nowrap;
width: 700upx; margin:0 auto; overflow: hidden; height: 100%;">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item)">
<view style="float: left; margin: 10upx;
display: flex;align-items: center;
background: #fff;border-radius: 15upx; position: relative;
height: 300upx; width: 210upx;" hover-class="brandactive" :class="[brandtext == item.title ? 'brandactive':'' ]">
<image mode="widthFix" style="width:calc(100% - 60upx);margin: auto;"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image>
<!-- front_image -->
<!-- :src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_700'"></image> -->
<view style="text-align: center; font-size: 24upx; width: 100%;
color:#333; position: absolute; bottom: 20upx; ">
<view
style=" width: 562upx; border-radius: 20upx; height: 742upx; z-index: 998; position: absolute ;margin:auto; top:0; right: 0; left: 0; bottom: 0;flex-direction: column">
<image src="../../static/icon_home_good_back.png" style="width: 562upx; border-radius: 20upx;
height: 720upx;
left:50%;
top:50%;
transform: translate(-50%,-50%);
position: absolute; " />
<view style="position: absolute;
width: 562upx; height:720upx;
top: 0; ">
<view style="
width: 200upx;
height: 120upx;
font-size: 34upx;
font-weight: 500;
color: #000; margin: 0 auto;
text-align: center;line-height: 120upx;">蛋糕形状</view>
<view style="height: 280upx; ">
<view v-for="(item,index) in goods" :key="index" @click="goodclick(item,index)">
<view style="
margin-left: 70upx;
float: left;
border-radius: 15upx;
position: relative;
width: 180upx">
<image mode="center"
:class="[goodCurrentIndexTop == index? 'good-item-select':'good-item-no-select' ]"
:src="item.goods_pic + '?x-oss-process=image/resize,lfit,w_210'"></image>
<view style="text-align: center; font-size: 30upx; width: 100%;
color:#000; margin-top: 30upx;">
{{item !=null ? item.name : ''}}
</view>
</view>
</view>
</scroll-view>
<!-- <swiper class="swiper-block" :indicator-dots="false" :autoplay="false" :interval="3000" :duration="1000"
circular='false' previous-margin='80rpx' next-margin='80rpx' :current="currentIndex"
@change="swiperChangeGood">
<swiper-item class="swiper-item" v-for="(item,index) in goods" :key="index" >
<view @click="goodclick(item)" :class="['slide-image', currentIndex === index?'active':'']" mode="aspectFill"
style="justify-content: center; align-items: center; ">
<image :src="item.front_image_old + '?x-oss-process=image/resize,lfit,w_450'"
style="width: 450upx; position: absolute;left: 50%;top:50%;transform: translate(-50%,-50%);"
mode="widthFix">
</image>
</view>
<view
style="width: 100%;font-size: 28upx;color: #333333;text-align: center; position: absolute; bottom: 100upx; z-index: 999; ">
{{item !=null ? item.name : ''}}
style="margin-top: 50upx; width: 100%; display: flex; flex-direction: row; justify-content: center;">
<view v-for="(item,index) in selectGood.attribute" :key="index" @click="sizeclick(item,index)">
<view style="
border-radius: 15upx;
position: relative;
margin: 10upx;">
<view :class="[sizeCurrentIndexTop == index? 'size-item-select':'size-item-no-select' ]">
{{item !=null ? item.title : ''}}
</view>
</view>
</view>
</view>
<view @click="saveGood()" style="width: 289upx;
height: 84upx;
background: #F29F3D;
border-radius: 42px;
color: #fff;
font-size: 32upx;
margin: 0 auto;
line-height: 84upx;
margin-top:60upx;
text-align: center;"> 确定</view>
</view>
</swiper-item>
</swiper> -->
</view>
</view>
......@@ -65,39 +84,55 @@
data() {
return {
isShow: false, //是否显示
goodtext: '', //选择商品名称
/* 控制被选中 */
currentIndex: 0,
/* 控制位置 */
goodsitem: null,
queryPage: {
s: 'Material.list',
},
goods: [], //商品列表
machine_id: null, //机器码
selectGood: null, //选中商品
goodCurrentIndexTop: 0, //上面商品选中
sizeCurrentIndexTop: 0, //下面尺寸选中
selectGoodSize: null, //选中商品尺寸
};
},
mounted() {},
methods: {
//保存商品
saveGood() {
if (this.selectGood == null) {
return;
}
if (this.selectGoodSize == null) {
return;
}
this.isShow = false;
this.goodtext = this.selectGoodSize.title //选择商品名
//console.log("this.goodtext="+this.goodtext);
this.$emit('selectGoodItem', {
id: this.selectGood.id,
title: this.goodtext,
key: this.selectGoodSize.key,
})
},
//关闭视图
closeView() {
this.isShow = false;
},
//商品列表滚
swiperChangeGood(event) {
this.currentIndex = event.detail.current
//商品点击事件
goodclick(item, index) {
this.selectGood = item;
this.goodCurrentIndexTop = index;
this.sizeCurrentIndexTop = 0;
if (this.selectGood.attribute && this.selectGood.attribute.length > 0) {
this.selectGoodSize = this.selectGood.attribute[0];
}
},
//商品点击事件
goodclick(e) {
this.isShow = false;
this.goodtext = e.name //选择商品名
this.$emit('selectGoodItem', {
id: e.id,
})
sizeclick(item, index) {
this.selectGoodSize = item
this.sizeCurrentIndexTop = index;
},
//打开页面
......@@ -110,11 +145,17 @@
getGooods() {
let that = this;
homeservice.queryList({
s: 'Product.getCommonGoods', //新接口
machine_id: this.machine_id, //机器码
machine_id: this.machine_id,
s: 'machine.newDetail'
}).then(result => {
this.goods = result;
if (this.goods == null || this.goods == "") {
this.goods = result.goods;
if (this.goods != null && this.goods.length > 0) {
this.selectGood = this.goods[0];
}
if (this.selectGood.attribute && this.selectGood.attribute.length > 0) {
this.selectGoodSize = this.selectGood.attribute[0];
}
if (this.goods == null || this.goods.length == 0) {
this.isShow = false;
uni.showToast({
title: "设备号不存在，或者没配置商品",
......@@ -151,52 +192,43 @@
.swiper-block {
height: 100%;
width: 100%;
/* height: calc(100% - 300upx);
width: 100%;
position: absolute;
top: 150upx; */
}
.swiper-item {
display: flex;
flex-direction: column;
justify-content: center;
align-items: flex-start;
overflow: unset;
.good-item-select {
border: 5upx #F29F3D solid;
height: 180upx;
width: 180upx;
border-radius: 15upx;
}
.slide-image {
height: calc(100% - 100upx);
width: 520upx;
border-radius: 20upx;
z-index: 1;
margin: 0upx 40upx;
background: url("../../static/item_good_frame.png")
.good-item-no-select {
height: 180upx;
width: 180upx;
border-radius: 15upx;
border: 5upx transparent solid;
}
.active {
transform: scale(1.14);
transition: all 0.2s ease-in 0s;
z-index: 20;
.size-item-select {
border: 2upx #F29F3D solid;
width: 66upx;
height: 66upx;
background: #F5F5F5;
border-radius: 15upx;
line-height: 66upx;
color: #000;
font-size: 30upx;
text-align: center;
}
/* .classification {
width: 300upx;
height: 80upx;
line-height: 80upx;
.size-item-no-select {
width: 66upx;
height: 66upx;
background: #F5F5F5;
border-radius: 15upx;
line-height: 66upx;
font-size: 30upx;
color: #000;
text-align: center;
background: #EEEEEE;
border-radius: 0 0 40upx 0;
font-size: 36upx;
color: #666666;
&.active {
background: #864BC3 !important;
color: #FFFFFF !important;
border: 2upx transparent solid;
}
} */
// 分类
</style>
pages/mine/self_help_payment_details.vue
......@@ -6,9 +6,6 @@
<!-- 打印机音乐 -->
<audio src="https://img.colorpark.cn/wechat/ring2.m4a" :action="ringaction" controls loop
style="opacity: 0; position: absolute;"></audio>
......
project.config.json 0 → 100644
{
"appid": "wx1f880e9650ae72ac",
"compileType": "miniprogram",
"libVersion": "2.27.0",
"packOptions": {
"ignore": [],
"include": []
},
"setting": {
"coverView": true,
"es6": true,
"postcss": true,
"minified": true,
"enhance": true,
"showShadowRootInWxmlPanel": true,
"packNpmRelationList": [],
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"condition": {},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 4
}
}
\ No newline at end of file
project.private.config.json 0 → 100644
{
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "wechat_baking",
"setting": {
"compileHotReLoad": true
}
}
\ No newline at end of file
static/icon/icon_refresh.png
static/icon/icon_refresh.png

971 Bytes | W: | H:

static/icon/icon_refresh.png

971 Bytes | W: | H:

static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
static/icon/icon_refresh.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png

1.49 KB | W: | H:

static/icon/icon_refresh_red.png

1.49 KB | W: | H:

static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
static/icon/icon_refresh_red.png
  • 2-up
  • Swipe
  • Onion skin
static/icon/replace.png
static/icon/replace.png

2.05 KB | W: | H:

static/icon/replace.png

1.37 KB | W: | H:

static/icon/replace.png
static/icon/replace.png
static/icon/replace.png
static/icon/replace.png
  • 2-up
  • Swipe
  • Onion skin
static/icon_confirm.png
static/icon_confirm.png

486 Bytes | W: | H:

static/icon_confirm.png

469 Bytes | W: | H:

static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
static/icon_confirm.png
  • 2-up
  • Swipe
  • Onion skin
static/liebiao.png
static/liebiao.png

37.3 KB | W: | H:

static/liebiao.png

34.9 KB | W: | H:

static/liebiao.png
static/liebiao.png
static/liebiao.png
static/liebiao.png
  • 2-up
  • Swipe
  • Onion skin
util/Env.js
......@@ -18,9 +18,9 @@ const baseURL = baseApi[accountInfo.miniProgram.envVersion]
const Env = {
getDevBaseURL: () => baseURL,
getBaseURL: () => baseURL,
getmachineId: () => '100055', //线上100086 //测试 422001' //100086 //100055
getmachineId: () => '7122001', //7122001 //100160
getappcode: () => 'lite',
getmalltext: () => "色彩公园Lite",
getmalltext: () => "色彩公园烘焙",
getAppID: () => "wx1c777ee874c39b0b",
getcompany: () => "深圳市瑞丰彩科技有限公司",
//跳转--色彩小程序
......@@ -28,6 +28,5 @@ const Env = {
//getenvVersion: () => "trial",
getenvVersion: () => "release",
}
export default Env
\ No newline at end of file
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