Skip to content

K
kxz-app-phone-h5
Commit 7892104e by huahua
Options

提交

parent c94f60a4
Showing with 60 additions and 69 deletions
pages/index/assembly/switchLanguage.vue
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<view v-if="languagecenter" <view v-if="languagecenter"
style="position: fixed; z-index: 9998; top: 0; bottom: 0; margin: auto;" style="position: fixed; z-index: 9998; top: 0; bottom: 0; margin: auto;"
> >
<view @click="cancelLanguage()" <view @click="cancelLanguage()"
......
pages/index/index_phone.vue
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
margin: auto;" margin: auto;"
:style="{width: (data.editorWidth + 1 ) +'px',height: (data.editorHeight + 2 ) +'px'}"> :style="{width: (data.editorWidth + 1 ) +'px',height: (data.editorHeight + 2 ) +'px'}">
</image> </image>
<image :src="data.bgImage + '?x-oss-process=image/resize,lfit,w_400' " mode="aspectFit" <image :src="data.bgImage + '?x-oss-process=image/resize,lfit,w_400' " mode="aspectFit"
@load="loadbgImage" @load="loadbgImage"
style="position: absolute; style="position: absolute;
...@@ -1520,7 +1519,6 @@ ...@@ -1520,7 +1519,6 @@
return; return;
} }
let data = { let data = {
s: 'Order.create', s: 'Order.create',
type: type, //1：配送版，2：单机版，3：自助版 type: type, //1：配送版，2：单机版，3：自助版
...@@ -1797,8 +1795,7 @@ ...@@ -1797,8 +1795,7 @@
let ratioheight = (this.data.editorHeight * this.mix_scale) / image.height let ratioheight = (this.data.editorHeight * this.mix_scale) / image.height
//width = this.data.editorWidth * this.mix_scale //width = this.data.editorWidth * this.mix_scale
//height = image.height * ratiowidth //height = image.height * ratiowidth
//if (ratio >= 1) { //长方形
//if (ratio >= 1) { //长方形
//width = this.data.editorWidth * this.mix_scale * resultmix_scale //width = this.data.editorWidth * this.mix_scale * resultmix_scale
//height = image.height * ratiowidth * resultmix_scale //height = image.height * ratiowidth * resultmix_scale
// } else if (ratio < 1) { //长高方形 // } else if (ratio < 1) { //长高方形
...@@ -3081,10 +3078,8 @@ ...@@ -3081,10 +3078,8 @@
let ratio = image.width / image.height let ratio = image.width / image.height
let ratiowidth = (_this.data.editorWidth * _this.mix_scale) / image.width let ratiowidth = (_this.data.editorWidth * _this.mix_scale) / image.width
let ratioheight = (_this.data.editorHeight * _this.mix_scale) / image.height let ratioheight = (_this.data.editorHeight * _this.mix_scale) / image.height
height = _this.data.editorHeight * _this.mix_scale height = _this.data.editorHeight * _this.mix_scale
width = image.width * ratioheight width = image.width * ratioheight
//width = _this.data.editorWidth * _this.mix_scale //width = _this.data.editorWidth * _this.mix_scale
//height = image.height * ratiowidth //height = image.height * ratiowidth
let index = items.length; let index = items.length;
......
pages/login/login.vue
<template> <template>
<view class="content" v-if="longState" :style="{width:$tool.isPc()?$base.isPcWidth + 'px':'100%'}" <view class="content" v-if="longState" :style="{width:$tool.isPc()?$base.isPcWidth + 'px':'100%'}"
style="margin: auto;" style="margin: auto;">
>
<!-- 自定义头部 --> <!-- 自定义头部 -->
<view @click="back()" style="width: 100%; height: 120upx; "> <view @click="back()" style="width: 100%; height: 120upx; ">
<image src="../../static/icon_more_left.png" mode="aspectFit" <image src="../../static/icon_more_left.png" mode="aspectFit"
......
pages/mall/lineUp.vue
...@@ -195,6 +195,10 @@ ...@@ -195,6 +195,10 @@
this.designer = designer this.designer = designer
if (designer.status.value == 1) { if (designer.status.value == 1) {
this.clearIntervalTime() this.clearIntervalTime()
/*uni.navigateTo({
url: '../mine/self_help_payment_details?orderId=' + designer.order_id +
'&type=' + this.key + '&machine_id=' + this.queryPage.machine_id
}) */
} else { } else {
if (this.sighstate == true) return; if (this.sighstate == true) return;
this.sighstate = true this.sighstate = true
......
pages/mine/order.vue
...@@ -57,9 +57,6 @@ ...@@ -57,9 +57,6 @@
</view> </view>
<!--选择支付 --> <!--选择支付 -->
<uni-popup ref="showPayChange" type="center" style="position: fixed; z-index: 9999; "> <uni-popup ref="showPayChange" type="center" style="position: fixed; z-index: 9999; ">
<view <view
...@@ -88,7 +85,6 @@ ...@@ -88,7 +85,6 @@
{{$i18n.messages[$i18n.locale]['扫码支付']}} {{$i18n.messages[$i18n.locale]['扫码支付']}}
</view> </view>
<image :src="qrCodeSrc" style=" <image :src="qrCodeSrc" style="
height: 350upx; height: 350upx;
width: 350upx; width: 350upx;
...@@ -98,7 +94,6 @@ ...@@ -98,7 +94,6 @@
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
...@@ -334,10 +329,6 @@ ...@@ -334,10 +329,6 @@
} else { } else {
this.generateQRCode(url_pay) this.generateQRCode(url_pay)
} }
//console.log(result)
/* let url_pay = result.data.link
window.location.href = url_pay */
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
...@@ -411,26 +402,21 @@ ...@@ -411,26 +402,21 @@
} }
}, },
//获取库存与优惠券信息 //获取库存与优惠券信息
getMachineStock() { getMachineStock() {
homeservice.queryListPhone({ homeservice.queryListPhone({
s: 'Machine.getMachineStock', s: 'Machine.getMachineStock',
machine_id: this.machine_id, machine_id: this.machine_id,
// key: this.tabletext ? 3 : 1
key: "3" key: "3"
}).then(result => { }).then(result => {
console.log(result)
this.coupon = result.coupon this.coupon = result.coupon
this.stock = result.stock this.stock = result.stock
// 读出锁库存储存信息 //读出锁库存储存信息
this.sizetext_id = this.$base.lockInventory.id this.sizetext_id = this.$base.lockInventory.id
this.sizetext = this.$base.lockInventory.goods_size this.sizetext = this.$base.lockInventory.goods_size
this.sizestock = this.$base.lockInventory.stock this.sizestock = this.$base.lockInventory.stock
this.channel_no = this.$base.lockInventory.channel_no this.channel_no = this.$base.lockInventory.channel_no
this.dict_id = this.$base.lockInventory.dict_id this.dict_id = this.$base.lockInventory.dict_id
}).catch(err => { }).catch(err => {
//uni.showToast({title: err.msg,icon: 'none'}); //uni.showToast({title: err.msg,icon: 'none'});
}); });
......
static/lang/ja-ja.json
...@@ -181,5 +181,5 @@ ...@@ -181,5 +181,5 @@
"处理失败！图片中无清晰的真人头像":"画像にははっきりした実物の顔がない", "处理失败！图片中无清晰的真人头像":"画像にははっきりした実物の顔がない",
"人像抠图":"フィギュアけち", "人像抠图":"フィギュアけち",
"色彩增强":"カラーブースト", "色彩增强":"カラーブースト",
"扫码支付":"Scansiona il codice per pagare" "扫码支付":"コードをスキャンして支払う"
} }
static/lang/ru-ru.json
...@@ -181,5 +181,5 @@ ...@@ -181,5 +181,5 @@
"处理失败！图片中无清晰的真人头像":"На картине нет четкой головы. ", "处理失败！图片中无清晰的真人头像":"На картине нет четкой головы. ",
"人像抠图":"Человеческие фигуры. ", "人像抠图":"Человеческие фигуры. ",
"色彩增强":"Улучшение цвета ", "色彩增强":"Улучшение цвета ",
"扫码支付":"Digitalizar o código para pagar" "扫码支付":"Сканируйте код для оплаты"
} }
static/lang/th-th.json
{ {
"语言": "泰语", "语言": "泰语",
"排队列表":"รายการคิว", "排队列表":"รายการคิว",
"定制手机壳":"กรณีโทรศัพท์มือถือที่กำหนดเอง", "定制手机壳":"เคสโทรศัพท์มือถือที่ออกแบบเองได้",
"绘制成功":"วาดสำเร็จ", "绘制成功":"วาดได้สำเร็จ",
"绘制失败":"การวาดล้มเหลว", "绘制失败":"การวาดล้มเหลว",
"登录文本":"เข้าสู่ระบบข้อความ", "登录文本":"ข้อความเข้าสู่ระบบ",
"请输入您的手机号":"ป้อนหมายเลขโทรศัพท์มือถือของคุณ", "请输入您的手机号":"ป้อนหมายเลขโทรศัพท์มือถือของคุณ",
"请输入登录密码":"ป้อนรหัสผ่านเข้าสู่ระบบ", "请输入登录密码":"ป้อนรหัสผ่านเข้าสู่ระบบ",
"登录":"เข้าสู่ระบบ", "登录":"เข้าสู่ระบบ",
"正在登录中":"เข้าสู่ระบบ", "正在登录中":"เข้าสู่ระบบ",
"登陆成功":"ความสำเร็จในการลงจอด", "登陆成功":"เข้าสู่ระบบสำเร็จ",
"自动登录":"เข้าสู่ระบบอัตโนมัติ", "自动登录":"เข้าสู่ระบบอัตโนมัติ",
"手机号码格式不正确":"รูปแบบหมายเลขโทรศัพท์มือถือไม่ถูกต้อง", "手机号码格式不正确":"รูปแบบตัวเลขไม่ถูกต้อง",
"手机壁纸":"วอลล์เปเปอร์", "手机壁纸":"วอลล์เปเปอร์",
"贴图素材":"สติ๊กเกอร์", "贴图素材":"สติ๊กเกอร์",
"上传图片":"อัพโหลด", "上传图片":"อัพโหลดรูปภาพ",
"添加文字":"คำศัพท์", "添加文字":"เพิ่มข้อความ",
"添加涂鸦":"กราฟฟิตี", "添加涂鸦":"กราฟฟิตี",
"移除图片":"ลบ", "移除图片":"ลบ",
"清空底色":"ล้าง", "清空底色":"ล้าง",
......
static/lang/tur-tur.json
...@@ -181,5 +181,5 @@ ...@@ -181,5 +181,5 @@
"处理失败！图片中无清晰的真人头像":"Resimde açık gerçek kişin in avatar ı yok", "处理失败！图片中无清晰的真人头像":"Resimde açık gerçek kişin in avatar ı yok",
"人像抠图":"Çizgi kesme", "人像抠图":"Çizgi kesme",
"色彩增强":"Renk Yükselmesi", "色彩增强":"Renk Yükselmesi",
"扫码支付":"สแกนรหัสเพื่อชำระเงิน" "扫码支付":"Ödemek için kodu tarayın"
} }
static/lang/zh-cn.json
...@@ -180,5 +180,6 @@ ...@@ -180,5 +180,6 @@
"人像抠图":"人像抠图", "人像抠图":"人像抠图",
"色彩增强":"色彩增强", "色彩增强":"色彩增强",
"正在等待付款成功的通知":"正在等待付款成功的通知", "正在等待付款成功的通知":"正在等待付款成功的通知",
"刷新":"刷新" "刷新":"刷新",
"扫码支付":"扫码支付"
} }
unpackage/dist/build/web/index.html
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Customize Phone case</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Customize Phone case</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b920293a.js></script><script src=/static/js/index.63c97dad.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.a1725f63.js></script><script src=/static/js/index.35f804d5.js></script></body></html>
\ No newline at end of file \ No newline at end of file
unpackage/dist/build/web/static/js/chunk-vendors.a1725f63.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/build/web/static/js/chunk-vendors.b920293a.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/build/web/static/lang/th-th.json
{ {
"语言": "泰语", "语言": "泰语",
"排队列表":"รายการคิว", "排队列表":"รายการคิว",
"定制手机壳":"กรณีโทรศัพท์มือถือที่กำหนดเอง", "定制手机壳":"เคสโทรศัพท์มือถือที่ออกแบบเองได้",
"绘制成功":"วาดสำเร็จ", "绘制成功":"วาดได้สำเร็จ",
"绘制失败":"การวาดล้มเหลว", "绘制失败":"การวาดล้มเหลว",
"登录文本":"เข้าสู่ระบบข้อความ", "登录文本":"ข้อความเข้าสู่ระบบ",
"请输入您的手机号":"ป้อนหมายเลขโทรศัพท์มือถือของคุณ", "请输入您的手机号":"ป้อนหมายเลขโทรศัพท์มือถือของคุณ",
"请输入登录密码":"ป้อนรหัสผ่านเข้าสู่ระบบ", "请输入登录密码":"ป้อนรหัสผ่านเข้าสู่ระบบ",
"登录":"เข้าสู่ระบบ", "登录":"เข้าสู่ระบบ",
"正在登录中":"เข้าสู่ระบบ", "正在登录中":"เข้าสู่ระบบ",
"登陆成功":"ความสำเร็จในการลงจอด", "登陆成功":"เข้าสู่ระบบสำเร็จ",
"自动登录":"เข้าสู่ระบบอัตโนมัติ", "自动登录":"เข้าสู่ระบบอัตโนมัติ",
"手机号码格式不正确":"รูปแบบหมายเลขโทรศัพท์มือถือไม่ถูกต้อง", "手机号码格式不正确":"รูปแบบตัวเลขไม่ถูกต้อง",
"手机壁纸":"วอลล์เปเปอร์", "手机壁纸":"วอลล์เปเปอร์",
"贴图素材":"สติ๊กเกอร์", "贴图素材":"สติ๊กเกอร์",
"上传图片":"อัพโหลด", "上传图片":"อัพโหลดรูปภาพ",
"添加文字":"คำศัพท์", "添加文字":"เพิ่มข้อความ",
"添加涂鸦":"กราฟฟิตี", "添加涂鸦":"กราฟฟิตี",
"移除图片":"ลบ", "移除图片":"ลบ",
"清空底色":"ล้าง", "清空底色":"ล้าง",
......
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/Mapping.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/assembly/switchBrands.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index_phone.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/self_help_payment_details.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/common/main.js
...@@ -32,7 +32,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va ...@@ -32,7 +32,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__; wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
var lyzmldatepicker = function lyzmldatepicker() { var lyzmldatepicker = function lyzmldatepicker() {
__webpack_require__.e(/*! require.ensure | components/lyzml-datepicker/lyzml-datepicker */ "components/lyzml-datepicker/lyzml-datepicker").then((function () { __webpack_require__.e(/*! require.ensure | components/lyzml-datepicker/lyzml-datepicker */ "components/lyzml-datepicker/lyzml-datepicker").then((function () {
return resolve(__webpack_require__(/*! ./components/lyzml-datepicker/lyzml-datepicker.vue */ 421)); return resolve(__webpack_require__(/*! ./components/lyzml-datepicker/lyzml-datepicker.vue */ 449));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
_vue.default.use(_elementUi.default); _vue.default.use(_elementUi.default);
......
unpackage/dist/dev/mp-weixin/common/vendor.js
This source diff could not be displayed because it is too large. You can view the blob instead.
unpackage/dist/dev/mp-weixin/pages/index/custom-size.js
...@@ -312,17 +312,17 @@ var _homeservice = _interopRequireDefault(__webpack_require__(/*! @/service/home ...@@ -312,17 +312,17 @@ var _homeservice = _interopRequireDefault(__webpack_require__(/*! @/service/home
// //
var uniPopup = function uniPopup() { var uniPopup = function uniPopup() {
__webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () {
return resolve(__webpack_require__(/*! ../index/common/uni-popup/uni-popup.vue */ 447)); return resolve(__webpack_require__(/*! ../index/common/uni-popup/uni-popup.vue */ 475));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var NumSlider = function NumSlider() { var NumSlider = function NumSlider() {
__webpack_require__.e(/*! require.ensure | pages/index/assembly/NumSlider */ "pages/index/assembly/NumSlider").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/assembly/NumSlider */ "pages/index/assembly/NumSlider").then((function () {
return resolve(__webpack_require__(/*! ./assembly/NumSlider.vue */ 490)); return resolve(__webpack_require__(/*! ./assembly/NumSlider.vue */ 518));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var myhead = function myhead() { var myhead = function myhead() {
__webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () {
return resolve(__webpack_require__(/*! ../index/head/head.vue */ 433)); return resolve(__webpack_require__(/*! ../index/head/head.vue */ 461));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var _default = { var _default = {
......
unpackage/dist/dev/mp-weixin/pages/index/detailsphone.js
...@@ -101,7 +101,7 @@ var components ...@@ -101,7 +101,7 @@ var components
try { try {
components = { components = {
uniSwiperDot: function () { uniSwiperDot: function () {
return __webpack_require__.e(/*! import() | components/uni-swiper-dot/uni-swiper-dot */ "components/uni-swiper-dot/uni-swiper-dot").then(__webpack_require__.bind(null, /*! @/components/uni-swiper-dot/uni-swiper-dot.vue */ 426)) return __webpack_require__.e(/*! import() | components/uni-swiper-dot/uni-swiper-dot */ "components/uni-swiper-dot/uni-swiper-dot").then(__webpack_require__.bind(null, /*! @/components/uni-swiper-dot/uni-swiper-dot.vue */ 454))
}, },
} }
} catch (e) { } catch (e) {
...@@ -397,24 +397,30 @@ var _logoservice = _interopRequireDefault(__webpack_require__(/*! @/service/logo ...@@ -397,24 +397,30 @@ var _logoservice = _interopRequireDefault(__webpack_require__(/*! @/service/logo
// //
// //
// //
//
//
//
//
//
//
var myhead = function myhead() { var myhead = function myhead() {
__webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () {
return resolve(__webpack_require__(/*! ./head/head.vue */ 433)); return resolve(__webpack_require__(/*! ./head/head.vue */ 461));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var switchLanguage = function switchLanguage() { var switchLanguage = function switchLanguage() {
__webpack_require__.e(/*! require.ensure | pages/index/assembly/switchLanguage */ "pages/index/assembly/switchLanguage").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/assembly/switchLanguage */ "pages/index/assembly/switchLanguage").then((function () {
return resolve(__webpack_require__(/*! ./assembly/switchLanguage.vue */ 440)); return resolve(__webpack_require__(/*! ./assembly/switchLanguage.vue */ 468));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var uniSwiperDot = function uniSwiperDot() { var uniSwiperDot = function uniSwiperDot() {
__webpack_require__.e(/*! require.ensure | components/uni-swiper-dot/uni-swiper-dot */ "components/uni-swiper-dot/uni-swiper-dot").then((function () { __webpack_require__.e(/*! require.ensure | components/uni-swiper-dot/uni-swiper-dot */ "components/uni-swiper-dot/uni-swiper-dot").then((function () {
return resolve(__webpack_require__(/*! @/components/uni-swiper-dot/uni-swiper-dot.vue */ 426)); return resolve(__webpack_require__(/*! @/components/uni-swiper-dot/uni-swiper-dot.vue */ 454));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var uniPopup = function uniPopup() { var uniPopup = function uniPopup() {
__webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () {
return resolve(__webpack_require__(/*! ./common/uni-popup/uni-popup.vue */ 447)); return resolve(__webpack_require__(/*! ./common/uni-popup/uni-popup.vue */ 475));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var index = 0; // 所点击的图片的索引 var index = 0; // 所点击的图片的索引
...@@ -448,7 +454,7 @@ var _default = { ...@@ -448,7 +454,7 @@ var _default = {
msg: null, msg: null,
statusloading: null, statusloading: null,
//加载状态 //加载状态
phone: '18938664545', phone: '',
datainfo: { datainfo: {
windowHeight: 0, windowHeight: 0,
windowWidth: 0, windowWidth: 0,
...@@ -568,7 +574,7 @@ var _default = { ...@@ -568,7 +574,7 @@ var _default = {
mask: true mask: true
}); });
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: this.phone || '18938664545', phoneNumber: this.phone || '',
//仅为示例 //仅为示例
success: function success(res) { success: function success(res) {
uni.hideLoading(); uni.hideLoading();
...@@ -660,7 +666,6 @@ var _default = { ...@@ -660,7 +666,6 @@ var _default = {
this.currentId = index; this.currentId = index;
item.machine_id = this.machine_id; item.machine_id = this.machine_id;
this.open(item); this.open(item);
//this.$refs['scrollModeView'].open(item)
}, },
modelclick: function modelclick(e) { modelclick: function modelclick(e) {
_homeservice.default.queryListPhone({ _homeservice.default.queryListPhone({
...@@ -728,6 +733,8 @@ var _default = { ...@@ -728,6 +733,8 @@ var _default = {
}).then(function (res) { }).then(function (res) {
if (res) { if (res) {
_this8.list = res; _this8.list = res;
_this8.phone = res.phone;
//console.log(this.phone)
_this8.support_paypal = false; _this8.support_paypal = false;
if (_this8.list.support_paypal == 1) { if (_this8.list.support_paypal == 1) {
_this8.support_paypal = true; _this8.support_paypal = true;
...@@ -763,11 +770,12 @@ var _default = { ...@@ -763,11 +770,12 @@ var _default = {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); uni.hideLoading();
}).catch(function (err) { }).catch(function (err) {
//console.log(err)
_this8.msg = err.msg; _this8.msg = err.msg;
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
uni.hideLoading(); uni.hideLoading();
_this8.statusloading = 2; _this8.statusloading = 2;
_this8.phone = err.data.phone || '18938664545'; _this8.phone = err.data.phone || '';
}); });
}, },
Adlist: function Adlist() { Adlist: function Adlist() {
......
unpackage/dist/dev/mp-weixin/pages/index/index_phone.js
...@@ -187,37 +187,37 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o = ...@@ -187,37 +187,37 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
var kpsImageCutter = function kpsImageCutter() { var kpsImageCutter = function kpsImageCutter() {
__webpack_require__.e(/*! require.ensure | components/ksp-image-cutter/ksp-image-cutter */ "components/ksp-image-cutter/ksp-image-cutter").then((function () { __webpack_require__.e(/*! require.ensure | components/ksp-image-cutter/ksp-image-cutter */ "components/ksp-image-cutter/ksp-image-cutter").then((function () {
return resolve(__webpack_require__(/*! @/components/ksp-image-cutter/ksp-image-cutter.vue */ 454)); return resolve(__webpack_require__(/*! @/components/ksp-image-cutter/ksp-image-cutter.vue */ 482));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var ProgressBar = function ProgressBar() { var ProgressBar = function ProgressBar() {
__webpack_require__.e(/*! require.ensure | components/Progress-Bar/Progress-Bar */ "components/Progress-Bar/Progress-Bar").then((function () { __webpack_require__.e(/*! require.ensure | components/Progress-Bar/Progress-Bar */ "components/Progress-Bar/Progress-Bar").then((function () {
return resolve(__webpack_require__(/*! @/components/Progress-Bar/Progress-Bar.vue */ 461)); return resolve(__webpack_require__(/*! @/components/Progress-Bar/Progress-Bar.vue */ 489));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var myhead = function myhead() { var myhead = function myhead() {
__webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/head/head */ "pages/index/head/head").then((function () {
return resolve(__webpack_require__(/*! ./head/head.vue */ 433)); return resolve(__webpack_require__(/*! ./head/head.vue */ 461));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var Mapping = function Mapping() { var Mapping = function Mapping() {
__webpack_require__.e(/*! require.ensure | pages/index/Mapping */ "pages/index/Mapping").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/Mapping */ "pages/index/Mapping").then((function () {
return resolve(__webpack_require__(/*! ./Mapping.vue */ 468)); return resolve(__webpack_require__(/*! ./Mapping.vue */ 496));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var switchBrands = function switchBrands() { var switchBrands = function switchBrands() {
Promise.all(/*! require.ensure | pages/index/assembly/switchBrands */[__webpack_require__.e("common/vendor"), __webpack_require__.e("pages/index/assembly/switchBrands")]).then((function () { Promise.all(/*! require.ensure | pages/index/assembly/switchBrands */[__webpack_require__.e("common/vendor"), __webpack_require__.e("pages/index/assembly/switchBrands")]).then((function () {
return resolve(__webpack_require__(/*! ./assembly/switchBrands.vue */ 475)); return resolve(__webpack_require__(/*! ./assembly/switchBrands.vue */ 503));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var tuya = function tuya() { var tuya = function tuya() {
__webpack_require__.e(/*! require.ensure | pages/index/tuya */ "pages/index/tuya").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/tuya */ "pages/index/tuya").then((function () {
return resolve(__webpack_require__(/*! ./tuya.vue */ 483)); return resolve(__webpack_require__(/*! ./tuya.vue */ 511));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var uniPopup = function uniPopup() { var uniPopup = function uniPopup() {
__webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () { __webpack_require__.e(/*! require.ensure | pages/index/common/uni-popup/uni-popup */ "pages/index/common/uni-popup/uni-popup").then((function () {
return resolve(__webpack_require__(/*! ./common/uni-popup/uni-popup.vue */ 447)); return resolve(__webpack_require__(/*! ./common/uni-popup/uni-popup.vue */ 475));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe); }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
}; };
var OSS = __webpack_require__(/*! ali-oss */ 294); var OSS = __webpack_require__(/*! ali-oss */ 294);
...@@ -1003,8 +1003,8 @@ var _default = { ...@@ -1003,8 +1003,8 @@ var _default = {
/* 创建作品*/createWorks: function createWorks(e) { /* 创建作品*/createWorks: function createWorks(e) {
if (this.available == 0) return; if (this.available == 0) return;
var that = this; var that = this;
if (isclick == true) { //if (isclick == true) {
isclick = false; //isclick = false;
if (this.machine_id != undefined && this.machine_id != null && this.machine_id != '') { if (this.machine_id != undefined && this.machine_id != null && this.machine_id != '') {
this.machine_item = this.machineDetail; this.machine_item = this.machineDetail;
this.support_paypal = this.machineDetail.support_paypal; this.support_paypal = this.machineDetail.support_paypal;
...@@ -1019,7 +1019,7 @@ var _default = { ...@@ -1019,7 +1019,7 @@ var _default = {
}); });
isclick = true; isclick = true;
} }
} //}
}, },
createWorks_one: function createWorks_one(e) { createWorks_one: function createWorks_one(e) {
var _this9 = this; var _this9 = this;
...@@ -1469,7 +1469,6 @@ var _default = { ...@@ -1469,7 +1469,6 @@ var _default = {
var ratioheight = _this12.data.editorHeight * _this12.mix_scale / image.height; var ratioheight = _this12.data.editorHeight * _this12.mix_scale / image.height;
//width = this.data.editorWidth * this.mix_scale //width = this.data.editorWidth * this.mix_scale
//height = image.height * ratiowidth //height = image.height * ratiowidth
//if (ratio >= 1) { //长方形 //if (ratio >= 1) { //长方形
//width = this.data.editorWidth * this.mix_scale * resultmix_scale //width = this.data.editorWidth * this.mix_scale * resultmix_scale
//height = image.height * ratiowidth * resultmix_scale //height = image.height * ratiowidth * resultmix_scale
...@@ -2785,7 +2784,6 @@ var _default = { ...@@ -2785,7 +2784,6 @@ var _default = {
var ratioheight = _this.data.editorHeight * _this.mix_scale / image.height; var ratioheight = _this.data.editorHeight * _this.mix_scale / image.height;
height = _this.data.editorHeight * _this.mix_scale; height = _this.data.editorHeight * _this.mix_scale;
width = image.width * ratioheight; width = image.width * ratioheight;
//width = _this.data.editorWidth * _this.mix_scale //width = _this.data.editorWidth * _this.mix_scale
//height = image.height * ratiowidth //height = image.height * ratiowidth
var index = items.length; var index = items.length;
......
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