diff --git a/template/uni-app/api/user.js b/template/uni-app/api/user.js index 9237ff51b..adcf370b8 100644 --- a/template/uni-app/api/user.js +++ b/template/uni-app/api/user.js @@ -540,8 +540,8 @@ export function memberOverdueTime(data) { } /** - * 新版分享海报信息获取 - *  + * 新版分享海报信息获取 + * */ export function spreadMsg() { return request.get('user/spread_info'); @@ -549,23 +549,23 @@ export function spreadMsg() { /** - * 图片链接转base64 - *  + * 图片链接转base64 + * */ export function imgToBase(data) { return request.post('image_base64', data); } /** - * 获取小程序二维码 - *  + * 获取小程序二维码 + * */ export function routineCode(data) { return request.get('user/routine_code', data); } /** - * 消息中心 + * 消息中心 */ export function serviceRecord(data) { return request.get('user/record', data); diff --git a/template/uni-app/components/orderGoods/index.vue b/template/uni-app/components/orderGoods/index.vue index 0cd4437bd..657cf0897 100644 --- a/template/uni-app/components/orderGoods/index.vue +++ b/template/uni-app/components/orderGoods/index.vue @@ -56,7 +56,7 @@ @click.stop="evaluateTap(item.unique,orderId)"> {{$t(`评价`)}} {{$t(`申请退款`)}} @@ -80,6 +80,10 @@ type: Number, default: 0, }, + virtualType: { + type: Number, + default: 0, + }, evaluate: { type: Number, default: 0, diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json index 0f6bc8bed..5192b8206 100644 --- a/template/uni-app/manifest.json +++ b/template/uni-app/manifest.json @@ -63,7 +63,7 @@ "ios" : { "capabilities" : { "entitlements" : { - "com.apple.developer.associated-domains" : [ "applinks:", "applinks:demo26.crmeb.net", "applinks:bzapp.crmeb.net" ] + "com.apple.developer.associated-domains" : [ "applinks:", "applinks:", "applinks:" ] } }, "privacyDescription" : { @@ -85,13 +85,13 @@ "weixin" : { "__platform__" : [ "ios", "android" ], "appid" : "", - "UniversalLinks" : "https://bzapp.crmeb.net/uni-universallinks/__UNI__A3F1ED4/" + "UniversalLinks" : "" } }, "share" : { "weixin" : { "appid" : "", - "UniversalLinks" : "https://bzapp.crmeb.net/uni-universallinks/__UNI__A3F1ED4/" + "UniversalLinks" : "" } }, "push" : {}, @@ -106,7 +106,7 @@ "weixin" : { "appid" : "", "appsecret" : "", - "UniversalLinks" : "https://bzapp.crmeb.net/uni-universallinks/__UNI__A3F1ED4/" + "UniversalLinks" : "" } }, "ad" : {}, @@ -167,7 +167,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx1234567890", + "appid" : "wx3b82801238ca1b57", "setting" : { "urlCheck" : false, "minified" : true, diff --git a/template/uni-app/mixins/sharePoster.js b/template/uni-app/mixins/sharePoster.js index 4c07f1f9c..c046f3bb5 100644 --- a/template/uni-app/mixins/sharePoster.js +++ b/template/uni-app/mixins/sharePoster.js @@ -1,220 +1,269 @@ -// +---------------------------------------------------------------------- -// | CRMEB [ CRMEB赋能开发者,助力企业发展 ] -// +---------------------------------------------------------------------- -// | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved. -// +---------------------------------------------------------------------- -// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 -// +---------------------------------------------------------------------- -// | Author: CRMEB Team -// +---------------------------------------------------------------------- -import { - imageBase64 -} from "@/api/public"; -import { - getProductCode -} from "@/api/store.js"; -import i18n from '../utils/lang.js'; -let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; -export const sharePoster = { - data() { - return { - //二维码参数 - codeShow: false, - cid: '1', - codeVal: "", // 要生成的二维码值 - size: 200, // 二维码大小 - unit: 'upx', // 单位 - background: '#FFF', // 背景色 - foreground: '#000', // 前景色 - pdground: '#000', // 角标色 - codeIcon: '', // 二维码图标 - iconsize: 40, // 二维码图标大小 - lv: 3, // 二维码容错级别 , 一般不用设置,默认就行 - onval: true, // val值变化时自动重新生成二维码 - loadMake: true, // 组件加载完成后自动生成二维码 - base64Show: 0, - shareQrcode: 0, - followCode: '', - selectSku: {}, - currentPage: false, - sysHeight: sysHeight, - isShow: 0, - storeImageBase64: '' - }; - }, - methods: { - qrR(res) { - // #ifdef H5 - if (!this.$wechat.isWeixin() || this.shareQrcode != '1') { - this.PromotionCode = res; - this.followCode = '' - } - // #endif - // #ifdef APP-PLUS - this.PromotionCode = res; - // #endif - }, - getImageBase64() { - let that = this; - imageBase64(that.storeImage, '') - .then((res) => { - that.storeImageBase64 = res.data.image; - // that.PromotionCode = res.data.code; - }) - .catch(() => {}); - }, - /** - * 生成海报 - */ - goPoster() { - let that = this; - that.posters = false; - that.$set(that, "canvasStatus", true); - let arr2 - // #ifdef MP - arr2 = [that.posterbackgd, that.storeImage, that.PromotionCode]; - if (that.isDown) - return that.$util.Tips({ - title: i18n.t(`正在下载海报,请稍后再试`), - }); - // #endif - // #ifdef H5 || APP-PLUS - arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode]; - if (!that.storeImageBase64) - return that.$util.Tips({ - title: i18n.t(`正在下载海报,请稍后再试`), - }); - // #endif - uni.getImageInfo({ - src: that.PromotionCode, - fail: function(res) { - // #ifdef H5 - return that.$util.Tips({ - title: res, - }); - // #endif - // #ifdef MP - return that.$util.Tips({ - title: i18n.t(`正在下载海报,请稍后再试`), - }); - // #endif - }, - success() { - if (arr2[2] == "") { - //海报二维码不存在则从新下载 - that.downloadFilePromotionCode(function(msgPromotionCode) { - arr2[2] = msgPromotionCode; - if (arr2[2] == "") - return that.$util.Tips({ - title: i18n.t(`海报二维码生成失败`), - }); - that.$util.PosterCanvas( - arr2, - that.storeInfo.store_name, - that.storeInfo.price, - that.storeInfo.ot_price, - function(tempFilePath) { - that.$set(that, "posterImage", tempFilePath); - that.$set(that, "posterImageStatus", true); - that.$set(that, "canvasStatus", false); - that.$set(that, "actionSheetHidden", !that - .actionSheetHidden); - } - ); - }); - } else { - //生成推广海报 - that.$nextTick(e => { - that.$util.PosterCanvas( - arr2, - that.storeInfo.store_name, - that.storeInfo.price, - that.storeInfo.ot_price, - function(tempFilePath) { - that.$set(that, "posterImage", tempFilePath); - that.$set(that, "posterImageStatus", true); - that.$set(that, "canvasStatus", false); - that.$set(that, "actionSheetHidden", !that - .actionSheetHidden); - } - ); - }) - - } - }, - }); - }, - //替换安全域名 - setDomain(url) { - url = url ? url.toString() : ""; - //本地调试打开,生产请注销 - if (url.indexOf("https://") > -1) return url; - else return url.replace("http://", "https://"); - }, - //获取海报产品图 - downloadFilestoreImage() { - let that = this; - uni.downloadFile({ - url: that.setDomain(that.storeInfo.image), - success: function(res) { - that.storeImage = res.tempFilePath; - that.storeImageBase64 = res.tempFilePath; - }, - fail: function() { - return that.$util.Tips({ - title: "", - }); - that.storeImage = ""; - }, - }); - }, - /** - * 获取产品分销二维码 - * @param function successFn 下载完成回调 - * - */ - downloadFilePromotionCode(successFn) { - let that = this; - // #ifdef MP - getProductCode(that.id) - .then((res) => { - uni.downloadFile({ - url: that.setDomain(res.data.code), - success: function(res) { - that.$set(that, "isDown", false); - that.$set(that, "PromotionCode", res.tempFilePath) - if (typeof successFn == "function") - successFn && successFn(res.tempFilePath); - }, - fail: function() { - that.$set(that, "isDown", false); - that.$set(that, "PromotionCode", ""); - }, - }); - }) - .catch((err) => { - that.$set(that, "isDown", false); - that.$set(that, "PromotionCode", ""); - return that.$util.Tips({ - title: err, - }); - }); - // #endif - // #ifdef APP-PLUS - uni.downloadFile({ - url: that.setDomain(that.PromotionCode), - success: function(res) { - that.$set(that, "isDown", false); - if (typeof successFn == "function") - successFn && successFn(res.tempFilePath); - else that.$set(that, "PromotionCode", res.tempFilePath); - }, - fail: function() { - that.$set(that, "isDown", false); - that.$set(that, "PromotionCode", ""); - }, - }); - // #endif - }, - } -}; +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者,助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件,未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import { + imageBase64 +} from "@/api/public";ß +import { + getProductCode +} from "@/api/store.js"; +import i18n from '../utils/lang.js'; +let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; +export const sharePoster = { + data() { + return { + //二维码参数 + codeShow: false, + cid: '1', + codeVal: "", // 要生成的二维码值 + size: 200, // 二维码大小 + unit: 'upx', // 单位 + background: '#FFF', // 背景色 + foreground: '#000', // 前景色 + pdground: '#000', // 角标色 + codeIcon: '', // 二维码图标 + iconsize: 40, // 二维码图标大小 + lv: 3, // 二维码容错级别 , 一般不用设置,默认就行 + onval: true, // val值变化时自动重新生成二维码 + loadMake: true, // 组件加载完成后自动生成二维码 + base64Show: 0, + shareQrcode: 0, + followCode: '', + selectSku: {}, + currentPage: false, + sysHeight: sysHeight, + isShow: 0, + storeImageBase64: '' + }; + }, + methods: { + qrR(res) { + // #ifdef H5 + if (!this.$wechat.isWeixin() || this.shareQrcode != '1') { + this.PromotionCode = res; + this.followCode = '' + } + // #endif + // #ifdef APP-PLUS + this.PromotionCode = res; + // #endif + }, + getImageBase64() { + let that = this; + imageBase64(that.storeImage, '') + .then((res) => { + that.storeImageBase64 = res.data.image; + // that.PromotionCode = res.data.code; + }) + .catch(() => {}); + }, + initPoster(arr2) { + let that = this; + uni.getImageInfo({ + src: that.PromotionCode, + success() { + if (arr2[2] == "") { + //海报二维码不存在则从新下载 + that.downloadFilePromotionCode(function( + msgPromotionCode) { + arr2[2] = msgPromotionCode; + if (arr2[2] == "") + return that.$util.Tips({ + title: i18n.t( + `海报二维码生成失败` + ), + }); + that.$util.PosterCanvas( + arr2, + that.storeInfo.store_name, + that.storeInfo.price, + that.storeInfo.ot_price, + function(tempFilePath) { + that.$set(that, + "posterImage", + tempFilePath); + that.$set(that, + "posterImageStatus", + true); + that.$set(that, + "canvasStatus", + false); + that.$set(that, + "actionSheetHidden", + !that + .actionSheetHidden + ); + } + ); + }); + } else { + //生成推广海报 + that.$nextTick(e => { + that.$util.PosterCanvas( + arr2, + that.storeInfo.store_name, + that.storeInfo.price, + that.storeInfo.ot_price, + function(tempFilePath) { + that.$set(that, + "posterImage", + tempFilePath); + that.$set(that, + "posterImageStatus", + true); + that.$set(that, + "canvasStatus", + false); + that.$set(that, + "actionSheetHidden", + !that + .actionSheetHidden + ); + } + ); + }) + + } + }, + fail: function(res) { + // #ifdef H5 + return that.$util.Tips({ + title: res, + }); + // #endif + // #ifdef MP + return that.$util.Tips({ + title: i18n.t(`正在下载海报,请稍后再试`), + }); + // #endif + }, + }); + }, + /** + * 生成海报 + */ + async goPoster() { + let that = this; + that.posters = false; + that.$set(that, "canvasStatus", true); + let arr2 + // #ifdef MP + getProductCode(that.id) + .then((res) => { + uni.downloadFile({ + url: that.setDomain(res.data.code), + success: function(res) { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", res.tempFilePath) + if (typeof successFn == "function") + successFn && successFn(res.tempFilePath); + arr2 = [that.posterbackgd, that.storeImage, that.PromotionCode]; + that.initPoster(arr2) + }, + fail: function() { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", ""); + }, + }); + }) + .catch((err) => { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", ""); + return that.$util.Tips({ + title: err, + }); + }); + // #endif + // #ifdef H5 || APP-PLUS + arr2 = [that.posterbackgd, that.storeImageBase64, that.PromotionCode]; + console.log(arr2) + if (!that.storeImageBase64) + return that.$util.Tips({ + title: i18n.t(`正在下载海报,请稍后再试`), + }); + that.initPoster(arr2) + // #endif + console.log(arr2, 'arr2s') + + + }, + //替换安全域名 + setDomain(url) { + url = url ? url.toString() : ""; + //本地调试打开,生产请注销 + if (url.indexOf("https://") > -1) return url; + else return url.replace("http://", "https://"); + }, + //获取海报产品图 + downloadFilestoreImage() { + let that = this; + uni.downloadFile({ + url: that.setDomain(that.storeInfo.image), + success: function(res) { + that.storeImage = res.tempFilePath; + that.storeImageBase64 = res.tempFilePath; + }, + fail: function() { + return that.$util.Tips({ + title: "", + }); + that.storeImage = ""; + }, + }); + }, + /** + * 获取产品分销二维码 + * @param function successFn 下载完成回调 + * + */ + downloadFilePromotionCode(successFn) { + let that = this; + // #ifdef MP + getProductCode(that.id) + .then((res) => { + uni.downloadFile({ + url: that.setDomain(res.data.code), + success: function(res) { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", res.tempFilePath) + if (typeof successFn == "function") + successFn && successFn(res.tempFilePath); + }, + fail: function() { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", ""); + }, + }); + }) + .catch((err) => { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", ""); + return that.$util.Tips({ + title: err, + }); + }); + // #endif + // #ifdef APP-PLUS + uni.downloadFile({ + url: that.setDomain(that.PromotionCode), + success: function(res) { + that.$set(that, "isDown", false); + if (typeof successFn == "function") + successFn && successFn(res.tempFilePath); + else that.$set(that, "PromotionCode", res.tempFilePath); + }, + fail: function() { + that.$set(that, "isDown", false); + that.$set(that, "PromotionCode", ""); + }, + }); + // #endif + }, + } +}; diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index f54810942..d5df27593 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -152,7 +152,7 @@ diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue index 77358a54a..e385ff173 100644 --- a/template/uni-app/pages/goods_details/index.vue +++ b/template/uni-app/pages/goods_details/index.vue @@ -1,2392 +1,2403 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/components/seckill.vue b/template/uni-app/pages/index/diy/components/seckill.vue index 247fd43e3..1a7826cc1 100644 --- a/template/uni-app/pages/index/diy/components/seckill.vue +++ b/template/uni-app/pages/index/diy/components/seckill.vue @@ -20,7 +20,7 @@ hover-class='none'> - {{item.discountNum}}{{$t(`off`)}} + {{item.discountNum}}{{$t(`折`)}} {{item.title}} diff --git a/template/uni-app/pages/index/diy/components/swiperBg.vue b/template/uni-app/pages/index/diy/components/swiperBg.vue index 7cc935ead..49f871729 100644 --- a/template/uni-app/pages/index/diy/components/swiperBg.vue +++ b/template/uni-app/pages/index/diy/components/swiperBg.vue @@ -1,235 +1,247 @@ - - - - - diff --git a/template/uni-app/pages/index/diy/index.vue b/template/uni-app/pages/index/diy/index.vue index a0cd0d916..b1c802918 100644 --- a/template/uni-app/pages/index/diy/index.vue +++ b/template/uni-app/pages/index/diy/index.vue @@ -142,7 +142,9 @@ + {{ site_config }} + diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue index 0bcfcc106..a637864c3 100644 --- a/template/uni-app/pages/user/index.vue +++ b/template/uni-app/pages/user/index.vue @@ -611,7 +611,7 @@ res.data.routine_my_menus.forEach((el, index, arr) => { if (el.url == '/pages/admin/order/index' || el.url == '/pages/admin/order_cancellation/index' || el.name == - this.$t(`客服接待`)) { + '客服接待') { storeMenu.push(el) } else { myMenu.push(el) diff --git a/template/uni-app/pages/users/user_invoice_order/index.vue b/template/uni-app/pages/users/user_invoice_order/index.vue index 3c76f01fb..9ece69756 100644 --- a/template/uni-app/pages/users/user_invoice_order/index.vue +++ b/template/uni-app/pages/users/user_invoice_order/index.vue @@ -56,7 +56,7 @@ {{orderInfo.invoice.remark}} - + {{$t(`订单编号`)}}: diff --git a/template/uni-app/pages/users/user_vip/index.vue b/template/uni-app/pages/users/user_vip/index.vue index 818c741bf..10fb17ff8 100644 --- a/template/uni-app/pages/users/user_vip/index.vue +++ b/template/uni-app/pages/users/user_vip/index.vue @@ -64,7 +64,7 @@ {{$t(`我的成长特权`)}} - {{$t(`upgrading_svip`)}} + {{$t(`立即升级`)}}