From 1013ef4e554f21576e8d53c9733ec0796f649c2c Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Wed, 8 May 2024 17:48:33 +0800 Subject: [PATCH] edit --- App.vue | 4 +- api/order.js | 2 +- api/points_mall.js | 20 ++++---- api/user.js | 4 +- components/PriceChange/index.vue | 2 +- components/discountDetails/index.vue | 2 +- components/pay/index.vue | 2 +- components/payment/index.vue | 2 +- components/productWindow/index.vue | 2 +- components/treasureBox/index.vue | 2 +- config/app.js | 4 +- manifest.json | 24 +++++----- pages.json | 8 ++-- pages/admin/orderDetail/index.vue | 4 +- pages/annex/vip_grade/index.vue | 2 +- pages/columnGoods/goods_search/index.vue | 20 ++++---- pages/goods_details/index.vue | 4 +- pages/index/index.vue | 2 +- pages/order_details/index.vue | 6 +-- pages/order_details/stay.vue | 8 ++-- pages/order_pay_status/index.vue | 6 +-- pages/points_mall/exchange_record.vue | 2 +- pages/points_mall/goods_selection.vue | 2 +- pages/points_mall/index.vue | 6 +-- pages/points_mall/integral_goods_details.vue | 4 +- pages/points_mall/integral_goods_list.vue | 4 +- pages/points_mall/integral_order.vue | 22 ++++----- pages/points_mall/integral_order_details.vue | 8 ++-- pages/points_mall/integral_order_status.vue | 4 +- pages/points_mall/logistics_details.vue | 2 +- pages/product/goodsOnSale/index.vue | 7 +-- pages/product/list/index.vue | 14 +++--- pages/store/merchantDetails/index.vue | 4 +- pages/store/settled/index.vue | 6 ++- pages/store/settled/step2.vue | 48 ++++++++++++++------ pages/store/settled/step3.vue | 9 +++- pages/store/shopStreet/index.vue | 10 ++-- pages/user/index.vue | 4 +- pages/users/goods_logistics/index.vue | 2 +- pages/users/login/index.vue | 8 ++-- pages/users/order_confirm/index.vue | 18 ++++---- pages/users/order_list/index.vue | 6 +-- pages/users/order_list/search.vue | 2 +- pages/users/presell_order_list/index.vue | 2 +- pages/users/user_grade/index.vue | 10 ++-- pages/users/user_integral/index.vue | 24 +++++----- pages/users/user_invoice_order/index.vue | 4 +- pages/users/user_sgin/index.vue | 6 +-- 48 files changed, 201 insertions(+), 167 deletions(-) diff --git a/App.vue b/App.vue index 09e0ea7..8c0d1ab 100644 --- a/App.vue +++ b/App.vue @@ -21,9 +21,9 @@ balance_func_status: 0, //余额开关 recharge_switch: 0, // 充值开关 store_user_min_recharge: 0, //最小充值 - yue_pay_status: 0, //余额支付开关 + yue_pay_status: 0, //消费券支付开关 alipay_open: 0, //支付宝支付开关 - integration_pay_open:0,//积分兑付开关 + integration_pay_open:0,//铸源星兑付开关 routine_logo: '', //首页logo share_pic: '', site_logo: '', diff --git a/api/order.js b/api/order.js index 456d6ec..453f212 100644 --- a/api/order.js +++ b/api/order.js @@ -72,7 +72,7 @@ export function orderPay(id,data){ } /** - * 积分商品订单支付 + * 铸源星商品订单支付 * @param object data */ export function integralOrderPay(id,data){ diff --git a/api/points_mall.js b/api/points_mall.js index ec82ab4..95966b1 100644 --- a/api/points_mall.js +++ b/api/points_mall.js @@ -1,61 +1,61 @@ import request from "@/utils/request.js"; /** - * 积分商城--banner和金刚区 + * 铸源星商城--banner和金刚区 */ export function getIntegralHome() { return request.get("points/home",{},{noAuth: true}); } /** - * 积分商城--积分兑换区间 + * 铸源星商城--铸源星兑换区间 */ export function getIntegralScope() { return request.get("points/scope",{},{noAuth: true}); } /** - * 积分商城--商品列表 + * 铸源星商城--商品列表 */ export function getIntegralGoodsList(data) { return request.get("points/lst",data,{noAuth: true}); } /** - * 积分商城--商品列表 + * 铸源星商城--商品列表 */ export function getIntegralProductDetail(id) { return request.get(`points/detail/${id}`,{},{noAuth: true}); } /** - * 积分商城--生成订单 + * 铸源星商城--生成订单 */ export function integralOrderConfirm(data) { return request.post(`order/v3/check`,data,{noAuth: true}); } /** - * 积分商城--下单 + * 铸源星商城--下单 */ export function integralOrderCreate(data) { return request.post(`order/v3/create`,data,{noAuth: true}); } /** - * 积分商城--订单列表 + * 铸源星商城--订单列表 */ export function integralOrderList(data) { return request.get(`points/order/lst`,data,{noAuth: true}); } /** - * 积分商城--订单详情 + * 铸源星商城--订单详情 */ export function integralOrderDetail(id) { return request.get(`points/order/detail/${id}`,{},{noAuth: true}); } /** - * 积分商城--订单详情 + * 铸源星商城--订单详情 */ export function integralOrderTake(id) { return request.post(`points/order/take/${id}`,{},{noAuth: true}); } /** - * 积分商城--删除 + * 铸源星商城--删除 */ export function integralOrderDelete(id) { return request.post(`points/order/deleate/${id}`,{},{noAuth: true}); diff --git a/api/user.js b/api/user.js index 618b2d6..4dca686 100644 --- a/api/user.js +++ b/api/user.js @@ -164,7 +164,7 @@ export function extractLst(data) { return request.get("user/extract/lst", data); } /* - * 积分记录 + * 铸源星记录 * */ export function getIntegralList(data) { return request.get("user/integral/lst", data); @@ -834,7 +834,7 @@ export function getWhellAction() { return request.get('wheel/create', {}, {noAuth: true}) } /** - * 积分赠送 + * 铸源星赠送 * @param object data * */ diff --git a/components/PriceChange/index.vue b/components/PriceChange/index.vue index 4ddf3b7..7efba1b 100644 --- a/components/PriceChange/index.vue +++ b/components/PriceChange/index.vue @@ -40,7 +40,7 @@ - 积分抵扣(¥) + 铸源星支付(¥) {{ orderInfo.integral_price }} diff --git a/components/discountDetails/index.vue b/components/discountDetails/index.vue index 8f5d75f..4ff1947 100644 --- a/components/discountDetails/index.vue +++ b/components/discountDetails/index.vue @@ -16,7 +16,7 @@ - 积分抵扣： + 铸源星支付： -￥{{couponData.order_total_integral_price}} diff --git a/components/pay/index.vue b/components/pay/index.vue index b89a0e0..a6bf1cb 100644 --- a/components/pay/index.vue +++ b/components/pay/index.vue @@ -10,7 +10,7 @@ 请输入支付密码 - 扣除积分{{price*integral_cash_time}} + 铸源星支付:{{price*integral_cash_time}} 付款{{price}} diff --git a/components/payment/index.vue b/components/payment/index.vue index 73a374c..bc0f66c 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -146,7 +146,7 @@ title: '请选择要支付的订单' }); if (paytype == 'balance' && parseFloat(number) < parseFloat(that.totalPrice)) return that.$util.Tips({title: '余额不足！'}); - if (paytype == 'integral' && parseFloat(number/that.integral_cash_time) < parseFloat(that.totalPrice)) return that.$util.Tips({title: '积分不足！'}); + if (paytype == 'integral' && parseFloat(number/that.integral_cash_time) < parseFloat(that.totalPrice)) return that.$util.Tips({title: '铸源星不足！'}); uni.showLoading({ title: '支付中' }); diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 2190ab1..e7bc589 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -23,7 +23,7 @@ - {{attr.productSelect.ot_price}}积分 +{{attr.productSelect.price}}元 + {{attr.productSelect.ot_price}}铸源星 +{{attr.productSelect.price}}元 限购{{limitCount}}件 diff --git a/components/treasureBox/index.vue b/components/treasureBox/index.vue index 8154b43..2c8385a 100644 --- a/components/treasureBox/index.vue +++ b/components/treasureBox/index.vue @@ -20,7 +20,7 @@ 恭喜您获得 - {{drawInfo.text}}积分 + {{drawInfo.text}}铸源星 开心收下 继续开盲盒 diff --git a/config/app.js b/config/app.js index afa9a68..e7d76ea 100644 --- a/config/app.js +++ b/config/app.js @@ -6,11 +6,11 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -// let httpApi = 'http://many.shop.lo' //测试 +// let httpApi = 'http://192.168.1.107:8080' //测试 let httpApi = 'https://api.tropjoin.com' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net -// let wsApi = 'ws://192.168.3.20:8324' +// let wsApi = 'ws://192.168.1.107:8080' let wsApi = 'wss://ws.tropjoin.com' module.exports = { diff --git a/manifest.json b/manifest.json index 24b1af6..769de21 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { - "name" : "铸源商城", + "name" : "铸源优品", "appid" : "__UNI__496DF55", "description" : "", - "versionName" : "1.0.6", - "versionCode" : 127, + "versionName" : "1.0.2", + "versionCode" : 129, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -27,7 +27,8 @@ "iBeacon" : {}, "Geolocation" : {}, "Maps" : {}, - "Barcode" : {} + "Barcode" : {}, + "Camera" : {} }, "safearea" : { "bottom" : { @@ -60,21 +61,22 @@ "", "" ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], "permissionExternalStorage" : { "request" : "none", "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" }, "permissionPhoneState" : { "request" : "none" //拨打电话权限关闭 - } + }, + "targetSdkVersion" : 30 }, /* ios打包配置 */ "ios" : { "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报", - "NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", - "NSCameraUsageDescription" : "上传用户头像保存分享海报", + "NSPhotoLibraryUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报", + "NSPhotoLibraryAddUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报", + "NSCameraUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" }, @@ -105,9 +107,7 @@ } }, "push" : {}, - "oauth" : { - "apple" : {} - }, + "oauth" : {}, "ad" : {} }, "icons" : { diff --git a/pages.json b/pages.json index 4f096f0..e7329d7 100644 --- a/pages.json +++ b/pages.json @@ -15,7 +15,7 @@ "path": "pages/index/index", "style": { "navigationBarTitleText": "首页", - "navigationStyle": "custom", + // "navigationStyle": "custom", // #ifdef APP-PLUS "enablePullDownRefresh": false, // #endif @@ -257,7 +257,7 @@ { "path": "user_integral/index", "style": { - "navigationBarTitleText": "积分详情" + "navigationBarTitleText": "铸源星详情" } }, { @@ -1191,7 +1191,7 @@ "style": { "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#333333", - "navigationBarTitleText": "积分商城", + "navigationBarTitleText": "铸源星商城", "app-plus": { // #ifdef APP-PLUS "titleNView": { @@ -1247,7 +1247,7 @@ { "path": "integral_order", "style": { - "navigationBarTitleText": "积分订单", + "navigationBarTitleText": "铸源星订单", "app-plus": { // #ifdef APP-PLUS "titleNView": { diff --git a/pages/admin/orderDetail/index.vue b/pages/admin/orderDetail/index.vue index f25ff13..4207795 100644 --- a/pages/admin/orderDetail/index.vue +++ b/pages/admin/orderDetail/index.vue @@ -86,7 +86,7 @@ 支付方式： - {{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }} + {{ orderInfo.pay_type == 0 ? "消费券支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }} 买家留言： @@ -112,7 +112,7 @@ -￥{{ orderInfo.coupon_price }} - 积分抵扣： + 铸源星支付： -￥{{ orderInfo.integral_price }} diff --git a/pages/annex/vip_grade/index.vue b/pages/annex/vip_grade/index.vue index fea6724..98f963c 100644 --- a/pages/annex/vip_grade/index.vue +++ b/pages/annex/vip_grade/index.vue @@ -21,7 +21,7 @@ {{info.user.integral}} - 积分 + 铸源星 {{ info.level_info.discount　?　parseFloat(info.level_info.discount)/10　:　'0'}} diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue index 770cd30..32e7e76 100644 --- a/pages/columnGoods/goods_search/index.vue +++ b/pages/columnGoods/goods_search/index.vue @@ -39,7 +39,7 @@ - + - + @@ -212,15 +212,15 @@ }, /*今日热搜*/ getHotSearchList(){ - getTodayHotSearch().then(res => { - this.$set(this, 'daySearchList', res.data); - }); + // getTodayHotSearch().then(res => { + // this.$set(this, 'daySearchList', res.data); + // }); }, /*热销排行*/ getHotRankingList(){ - getHotRanking().then(res => { - this.$set(this, 'hotRankList', res.data); - }); + // getHotRanking().then(res => { + // this.$set(this, 'hotRankList', res.data); + // }); }, setHotSearchValue: function(event, key) { this.focus = false diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index d716b94..03ac33e 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -46,7 +46,7 @@ - 积分最高可抵扣{{storeInfo.max_integral}}元 + 铸源星最高可抵扣{{storeInfo.max_integral}}元 包邮 @@ -82,7 +82,7 @@ - 积分最高可抵扣{{storeInfo.max_integral}}元 + 铸源星最高可抵扣{{storeInfo.max_integral}}元 包邮 diff --git a/pages/index/index.vue b/pages/index/index.vue index 4fbda4c..1707fe8 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -478,7 +478,7 @@ export default { this.diyId = options.diyId || 0; this.preview = options.time ? true : false; // #ifdef APP-PLUS - that.appVersionConfig(); //APP版本检测 + // that.appVersionConfig(); //APP版本检测 // #endif that.$nextTick(function() { uni.getSystemInfo({ diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 0513cde..ca1cdc4 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -208,7 +208,7 @@ 支付方式： - 余额支付 + 消费券支付 支付宝支付 微信支付 @@ -237,7 +237,7 @@ -￥{{orderInfo.coupon_price}} - 积分抵扣： + 铸源星支付： -￥{{orderInfo.integral_price}} @@ -362,7 +362,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index 5a555d7..7180192 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -152,7 +152,7 @@ -￥{{orderInfo.coupon_price}} - 积分抵扣： + 铸源星支付： -￥{{orderInfo.integral_price}} @@ -221,7 +221,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', @@ -229,10 +229,10 @@ payStatus: this.$store.getters.globalData.yue_pay_status }, { - name: "积分兑付", + name: "铸源星支付", icon: "haiyuefont haiyue-jifenduihuan", value: 'integral', - title: '可用积分:', + title: '可用铸源星:', number: 0, payStatus: this.$store.getters.globalData.integration_pay_open, }, diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue index 7f37e20..66fe766 100644 --- a/pages/order_pay_status/index.vue +++ b/pages/order_pay_status/index.vue @@ -19,7 +19,7 @@ 兑换方式 - 积分兑换 + 铸源星兑换 支付方式 @@ -28,7 +28,7 @@ 余额 - 支付积分 + 支付铸源星 {{order_pay_info.integral}} @@ -36,7 +36,7 @@ {{order_pay_info.pay_price}} - 赠送积分 + 赠送铸源星 {{order_pay_info.give_integral}} diff --git a/pages/points_mall/exchange_record.vue b/pages/points_mall/exchange_record.vue index c118521..467e1cb 100644 --- a/pages/points_mall/exchange_record.vue +++ b/pages/points_mall/exchange_record.vue @@ -87,7 +87,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', diff --git a/pages/points_mall/goods_selection.vue b/pages/points_mall/goods_selection.vue index f0ffbba..9cdbff1 100644 --- a/pages/points_mall/goods_selection.vue +++ b/pages/points_mall/goods_selection.vue @@ -26,7 +26,7 @@ - {{ item.ot_price }}积分 + {{ item.ot_price }}铸源星 +{{parseFloat(Number(item.price).toFixed(2))}}元 diff --git a/pages/points_mall/index.vue b/pages/points_mall/index.vue index cd9adc2..0ef245a 100644 --- a/pages/points_mall/index.vue +++ b/pages/points_mall/index.vue @@ -58,7 +58,7 @@ - {{ item.ot_price }}积分 + {{ item.ot_price }}铸源星 +{{parseFloat(Number(item.price).toFixed(2))}}元 @@ -139,7 +139,7 @@ } return newArray; }, - // 获取积分区间 + // 获取铸源星区间 getIntegralScope() { getIntegralScope().then(res => { res.data.unshift({title: '全部',group_data_id: '',min: '',max: ''}) @@ -167,7 +167,7 @@ this.goodList = []; this.getIntegralGoods(); }, - //积分商品列表 + //铸源星商品列表 getIntegralGoods(){ let that = this; if (that.loadend) return; diff --git a/pages/points_mall/integral_goods_details.vue b/pages/points_mall/integral_goods_details.vue index c0c1131..fefb040 100644 --- a/pages/points_mall/integral_goods_details.vue +++ b/pages/points_mall/integral_goods_details.vue @@ -19,7 +19,7 @@ {{storeInfo.ot_price || 0}} - 积分+{{storeInfo.price}}元 + 铸源星+{{storeInfo.price}}元 @@ -62,7 +62,7 @@ - 积分商城 + 铸源星商城 默认 - 积分 + 铸源星 @@ -35,7 +35,7 @@ - {{ item.ot_price }}积分 + {{ item.ot_price }}铸源星 +{{parseFloat(Number(item.price).toFixed(2))}}元 diff --git a/pages/points_mall/integral_order.vue b/pages/points_mall/integral_order.vue index 7766816..cb88c5a 100644 --- a/pages/points_mall/integral_order.vue +++ b/pages/points_mall/integral_order.vue @@ -40,7 +40,7 @@ - {{goods.productAttr.ot_price}}积分+{{goods.productAttr.price}}元 + {{goods.productAttr.ot_price}}铸源星+{{goods.productAttr.price}}元 @@ -57,13 +57,13 @@ - 可用积分 - {{resData.true_integral}}积分 + 可用铸源星 + {{resData.true_integral}}铸源星 - 兑换积分 - {{resData.order_total_integral}}积分 + 兑换铸源星 + {{resData.order_total_integral}}铸源星 @@ -125,7 +125,7 @@ 支付： - {{resData.order_total_integral || 0}}积分+{{resData.order_pay_price}}元 + {{resData.order_total_integral || 0}}铸源星+{{resData.order_pay_price}}元 立即兑换 @@ -188,7 +188,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - "name": "余额支付", + "name": "消费券支付", "icon": "icon-icon-test", value: 'balance', title: '可用余额:', @@ -219,10 +219,10 @@ mark: '', //备注信息 couponTitle: '请选择', //优惠券 coupon_price: 0, //优惠券抵扣金额 - useIntegral: false, //是否使用积分 - integral_price: 0, //积分抵扣金额 + useIntegral: false, //是否使用铸源星 + integral_price: 0, //铸源星抵扣金额 integral: 0, - ChangePrice: 0, //使用积分抵扣变动后的金额 + ChangePrice: 0, //使用铸源星抵扣变动后的金额 formIds: [], //收集formid status: 0, is_address: false, @@ -345,7 +345,7 @@ } if (parseFloat(that.resData.true_integral) < parseFloat(that.resData.order_total_integral)) return that.$util.Tips({ - title: '积分不足！' + title: '铸源星不足！' }); data = { diff --git a/pages/points_mall/integral_order_details.vue b/pages/points_mall/integral_order_details.vue index 56e51b5..8098d72 100644 --- a/pages/points_mall/integral_order_details.vue +++ b/pages/points_mall/integral_order_details.vue @@ -42,7 +42,7 @@ {{item.cart_info.productAttr.sku || '默认'}} - {{item.integral}}积分 +{{item.product_price}}元 + {{item.integral}}铸源星 +{{item.product_price}}元 @@ -84,8 +84,8 @@ {{orderInfo.paid == 1 ? '已支付' : '未支付'}} - 支付积分： - {{orderInfo.integral}}积分 + 支付铸源星： + {{orderInfo.integral}}铸源星 支付金额： @@ -172,7 +172,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', diff --git a/pages/points_mall/integral_order_status.vue b/pages/points_mall/integral_order_status.vue index 678ac68..52bed6f 100644 --- a/pages/points_mall/integral_order_status.vue +++ b/pages/points_mall/integral_order_status.vue @@ -18,10 +18,10 @@ 兑换方式 - 积分兑换 + 铸源星兑换 - 兑换积分 + 兑换铸源星 {{order_pay_info.total_price}} diff --git a/pages/points_mall/logistics_details.vue b/pages/points_mall/logistics_details.vue index 3c6fb08..b5f9725 100644 --- a/pages/points_mall/logistics_details.vue +++ b/pages/points_mall/logistics_details.vue @@ -8,7 +8,7 @@ {{orderInfo.store_name}} - {{orderInfo.total_price}}积分 + {{orderInfo.total_price}}铸源星 x{{orderInfo.total_num}} diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue index 33e5983..e793a8d 100644 --- a/pages/product/goodsOnSale/index.vue +++ b/pages/product/goodsOnSale/index.vue @@ -53,9 +53,10 @@ 下架 上架 - 删除 - 恢复 - 编辑 + 预览 + + + diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index 565dc9c..170d965 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -16,7 +16,7 @@ - @@ -24,7 +24,7 @@ 在售商品 - + - + @@ -86,8 +86,8 @@ 上架 预览 - 删除 - {{item.is_good ? '取消推荐' : '店铺推荐'}} + + diff --git a/pages/store/merchantDetails/index.vue b/pages/store/merchantDetails/index.vue index 1c3367d..fbcb165 100644 --- a/pages/store/merchantDetails/index.vue +++ b/pages/store/merchantDetails/index.vue @@ -14,7 +14,7 @@ 商户账号： - {{resData.mer_name}} + {{resData.mer_account}} 复制 @@ -50,7 +50,7 @@ }) }, copyTBL(url) { - let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_name}` + let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_account}` // #ifdef MP || APP-PLUS uni.setClipboardData({ data: copeData, diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 31bc6b6..351e6bb 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -626,7 +626,11 @@ */ uploadpic(item) { let that = this; - that.$util.uploadImageOne('upload/image', function(res) { + let params = { + url:'upload/image', + name:'file' + } + that.$util.uploadImageOne(params, function(res) { item.push(res.data.path); that.validateBtn(); // that.$set(that, 'pics', that.pics); diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue index 2ec56ed..21da0cd 100644 --- a/pages/store/settled/step2.vue +++ b/pages/store/settled/step2.vue @@ -29,7 +29,7 @@ - 身份证正、反面及法人手持身份证清晰照片 + 身份证正、反面及法人手持身份证清晰照片 {{shopInfo.idCardPhoto.length}}/3 @@ -204,10 +204,25 @@ 如为长期有效,请填写:2099年01月01日 + + + + + 营业执照注册地址 + + + + + + + + + + - 营业执照注册地址 - + - + diff --git a/pages/users/goods_logistics/index.vue b/pages/users/goods_logistics/index.vue index 453ad20..680406f 100644 --- a/pages/users/goods_logistics/index.vue +++ b/pages/users/goods_logistics/index.vue @@ -10,7 +10,7 @@ {{product.cart_info.product.store_name}} {{product.cart_info.productAttr.sku}} - {{product.cart_info.productAttr.ot_price}}个积分 +{{product.cart_info.productAttr.price}}元 + {{product.cart_info.productAttr.ot_price}}个铸源星 +{{product.cart_info.productAttr.price}}元 ￥{{product.product_price}} diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue index a0a2658..6b0aa9d 100644 --- a/pages/users/login/index.vue +++ b/pages/users/login/index.vue @@ -58,7 +58,7 @@ - +
@@ -109,7 +109,7 @@
- +
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 5886765..90e1bbd 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -402,10 +402,10 @@ -￥{{coupon_price}} - 积分抵扣： + 铸源星支付： - 当前积分{{userInfo.integral}} - 使用了{{integral_count}}个积分，抵扣当前铸源星{{userInfo.integral}} + 使用了{{integral_count}}个铸源星，抵扣{{integral_price}}元 @@ -437,7 +437,7 @@ 合计: - 扣除积分{{totalPrice*userInfo.integral_cash_time}} + 扣除铸源星{{totalPrice*userInfo.integral_cash_time}} ￥{{totalPrice || 0}} @@ -557,17 +557,17 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - "name": "余额支付", + "name": "消费券支付", "icon": "icon-icon-test", value: 'balance', title: '可用余额:', payStatus: this.$store.getters.globalData.yue_pay_status, }, { - "name": "积分兑付", + "name": "铸源星支付", "icon": "haiyuefont haiyue-jifenduihuan", value: 'integral', - title: '可用积分:', + title: '可用铸源星:', payStatus: this.$store.getters.globalData.integration_pay_open, }, { @@ -627,8 +627,8 @@ mark: '', //备注信息 couponTitle: '请选择', //优惠券 coupon_price: 0, //优惠券抵扣金额 - useIntegral: false, //是否使用积分 - integral_price: 0, //积分抵扣金额 + useIntegral: false, //是否使用铸源星 + integral_price: 0, //铸源星抵扣金额 integral: 0, status: 0, is_address: false, diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 974e5ef..2cf20b8 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -307,7 +307,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', @@ -315,10 +315,10 @@ payStatus: this.$store.getters.globalData.yue_pay_status }, { - name: "积分兑付", + name: "铸源星支付", icon: "haiyuefont haiyue-jifenduihuan", value: 'integral', - title: '可用积分:', + title: '可用铸源星:', number: 0, payStatus: this.$store.getters.globalData.integration_pay_open, }, diff --git a/pages/users/order_list/search.vue b/pages/users/order_list/search.vue index ae93f8b..e0448d1 100644 --- a/pages/users/order_list/search.vue +++ b/pages/users/order_list/search.vue @@ -255,7 +255,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', diff --git a/pages/users/presell_order_list/index.vue b/pages/users/presell_order_list/index.vue index 7527ad9..d6e97b2 100644 --- a/pages/users/presell_order_list/index.vue +++ b/pages/users/presell_order_list/index.vue @@ -107,7 +107,7 @@ payStatus: this.$store.getters.globalData.alipay_open }, { - name: "余额支付", + name: "消费券支付", icon: "icon-yuezhifu", value: 'balance', title: '可用余额:', diff --git a/pages/users/user_grade/index.vue b/pages/users/user_grade/index.vue index 9c25eec..5a88e6d 100644 --- a/pages/users/user_grade/index.vue +++ b/pages/users/user_grade/index.vue @@ -21,7 +21,7 @@ - + @@ -62,12 +62,12 @@ - {{userInfo.is_svip > 0 && svip_switch_status == 1 ? 'SVIP 会员中心，惊喜多多！' : '升级成为SVIP，成长值奖励可翻倍哦！'}} + 去看看 立即开通 - + diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue index 58764e0..7e89569 100644 --- a/pages/users/user_integral/index.vue +++ b/pages/users/user_integral/index.vue @@ -2,13 +2,13 @@ - 当前积分 ? + 当前铸源星 ? {{userInfo.integral ? userInfo.integral : 0}} {{userInfo.totalGainIntegral || 0}} - 累计积分 + 累计铸源星 {{userInfo.deductionIntegral || 0}} @@ -16,7 +16,7 @@ {{userInfo.lockIntegral || 0}} - 冻结积分 + 冻结铸源星 @@ -27,7 +27,7 @@ - 提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ + 提示：您有部分铸源星将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！ @@ -41,7 +41,7 @@ {{loadTitle}} - + @@ -58,8 +58,8 @@ - 积分 - + 铸源星 + 确认赠送 @@ -70,7 +70,7 @@ -
积分说明
+
铸源星说明
@@ -105,7 +105,7 @@ 'status':1, }, { - 'name': '积分赠送', + 'name': '铸源星赠送', 'icon': 'icon-tishengfenzhi', 'status':this.$store.getters.globalData.integral_give_status, } @@ -184,7 +184,7 @@ if(integral<=0){ uni.showToast({ icon:'none', - title: '积分数量必须大于0', + title: '铸源星数量必须大于0', }); return } @@ -228,7 +228,7 @@ }); }); }, - /*获取积分说明*/ + /*获取铸源星说明*/ getAgreement() { let that = this getAgreementApi('sys_integral_rule').then(res => { @@ -236,7 +236,7 @@ }) }, /** - * 获取积分明细 + * 获取铸源星明细 */ getIntegralList: function() { let that = this; diff --git a/pages/users/user_invoice_order/index.vue b/pages/users/user_invoice_order/index.vue index ddead38..33e9a16 100644 --- a/pages/users/user_invoice_order/index.vue +++ b/pages/users/user_invoice_order/index.vue @@ -81,12 +81,12 @@ ￥{{orderInfo.coupon_price}} - 积分抵扣： + 铸源星支付： ￥{{orderInfo.integral_price}} 支付方式： - 余额支付 + 消费券支付 支付宝支付 微信支付 diff --git a/pages/users/user_sgin/index.vue b/pages/users/user_sgin/index.vue index c7343a8..cf68922 100644 --- a/pages/users/user_sgin/index.vue +++ b/pages/users/user_sgin/index.vue @@ -7,7 +7,7 @@ {{userInfo.nickname}} - 积分: {{userInfo.integral ? userInfo.integral : 0}} + 铸源星: {{userInfo.integral ? userInfo.integral : 0}} @@ -39,7 +39,7 @@ {{signCount[3] || 0}} 天 - 据说连续签到第7天可获得超额积分，一定要坚持签到哦~~~ + 据说连续签到第7天可获得超额铸源星，一定要坚持签到哦~~~ @@ -57,7 +57,7 @@ 签到成功 - 获得{{integral}}积分 + 获得{{integral}}铸源星 好的