faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-05-08 17:48:33 +08:00
parent 2168a1f1b0
commit 1013ef4e55
48 changed files with 201 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -21,9 +21,9 @@
balance_func_status: 0, //余额开关 balance_func_status: 0, //余额开关
recharge_switch: 0, // 充值开关 recharge_switch: 0, // 充值开关
store_user_min_recharge: 0, //最小充值 store_user_min_recharge: 0, //最小充值
yue_pay_status: 0, //余额支付开关 yue_pay_status: 0, //消费券支付开关
alipay_open: 0, //支付宝支付开关 alipay_open: 0, //支付宝支付开关
integration_pay_open:0,//积分兑付开关 integration_pay_open:0,//铸源星兑付开关
routine_logo: '', //首页logo routine_logo: '', //首页logo
share_pic: '', share_pic: '',
site_logo: '', site_logo: '',

2
api/order.js
View File

@ -72,7 +72,7 @@ export function orderPay(id,data){
} }
/** /**
* 积分商品订单支付 * 铸源星商品订单支付
* @param object data * @param object data
*/ */
export function integralOrderPay(id,data){ export function integralOrderPay(id,data){

20
api/points_mall.js
View File

@ -1,61 +1,61 @@
import request from "@/utils/request.js"; import request from "@/utils/request.js";
/** /**
* 积分商城--banner和金刚区 * 铸源星商城--banner和金刚区
*/ */
export function getIntegralHome() { export function getIntegralHome() {
return request.get("points/home",{},{noAuth: true}); return request.get("points/home",{},{noAuth: true});
} }
/** /**
* 积分商城--积分兑换区间 * 铸源星商城--铸源星兑换区间
*/ */
export function getIntegralScope() { export function getIntegralScope() {
return request.get("points/scope",{},{noAuth: true}); return request.get("points/scope",{},{noAuth: true});
} }
/** /**
* 积分商城--商品列表 * 铸源星商城--商品列表
*/ */
export function getIntegralGoodsList(data) { export function getIntegralGoodsList(data) {
return request.get("points/lst",data,{noAuth: true}); return request.get("points/lst",data,{noAuth: true});
} }
/** /**
* 积分商城--商品列表 * 铸源星商城--商品列表
*/ */
export function getIntegralProductDetail(id) { export function getIntegralProductDetail(id) {
return request.get(`points/detail/${id}`,{},{noAuth: true}); return request.get(`points/detail/${id}`,{},{noAuth: true});
} }
/** /**
* 积分商城--生成订单 * 铸源星商城--生成订单
*/ */
export function integralOrderConfirm(data) { export function integralOrderConfirm(data) {
return request.post(`order/v3/check`,data,{noAuth: true}); return request.post(`order/v3/check`,data,{noAuth: true});
} }
/** /**
* 积分商城--下单 * 铸源星商城--下单
*/ */
export function integralOrderCreate(data) { export function integralOrderCreate(data) {
return request.post(`order/v3/create`,data,{noAuth: true}); return request.post(`order/v3/create`,data,{noAuth: true});
} }
/** /**
* 积分商城--订单列表 * 铸源星商城--订单列表
*/ */
export function integralOrderList(data) { export function integralOrderList(data) {
return request.get(`points/order/lst`,data,{noAuth: true}); return request.get(`points/order/lst`,data,{noAuth: true});
} }
/** /**
* 积分商城--订单详情 * 铸源星商城--订单详情
*/ */
export function integralOrderDetail(id) { export function integralOrderDetail(id) {
return request.get(`points/order/detail/${id}`,{},{noAuth: true}); return request.get(`points/order/detail/${id}`,{},{noAuth: true});
} }
/** /**
* 积分商城--订单详情 * 铸源星商城--订单详情
*/ */
export function integralOrderTake(id) { export function integralOrderTake(id) {
return request.post(`points/order/take/${id}`,{},{noAuth: true}); return request.post(`points/order/take/${id}`,{},{noAuth: true});
} }
/** /**
* 积分商城--删除 * 铸源星商城--删除
*/ */
export function integralOrderDelete(id) { export function integralOrderDelete(id) {
return request.post(`points/order/deleate/${id}`,{},{noAuth: true}); return request.post(`points/order/deleate/${id}`,{},{noAuth: true});

4
api/user.js
View File

@ -164,7 +164,7 @@ export function extractLst(data) {
return request.get("user/extract/lst", data); return request.get("user/extract/lst", data);
} }
/* /*
* 积分记录 * 铸源星记录
* */ * */
export function getIntegralList(data) { export function getIntegralList(data) {
return request.get("user/integral/lst", data); return request.get("user/integral/lst", data);
@ -834,7 +834,7 @@ export function getWhellAction() {
return request.get('wheel/create', {}, {noAuth: true}) return request.get('wheel/create', {}, {noAuth: true})
} }
/** /**
* 积分赠送 * 铸源星赠送
* @param object data * @param object data
* *
*/ */

2
components/PriceChange/index.vue
View File

@ -40,7 +40,7 @@
</view> </view>
</view> </view>
<view v-if="orderInfo.integral_price>0" class="item acea-row row-between-wrapper"> <view v-if="orderInfo.integral_price>0" class="item acea-row row-between-wrapper">
<view>积分抵扣(¥)</view> <view>铸源星支付(¥)</view>
<view class="money"> <view class="money">
{{ orderInfo.integral_price }}<span class="iconfont icon-suozi"></span> {{ orderInfo.integral_price }}<span class="iconfont icon-suozi"></span>
</view> </view>

2
components/discountDetails/index.vue
View File

@ -16,7 +16,7 @@
</view> </view>
</view> </view>
<view v-if="couponData.order_total_integral_price>0" class="check-item"> <view v-if="couponData.order_total_integral_price>0" class="check-item">
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class="radio"> <view class="radio">
-￥{{couponData.order_total_integral_price}} -￥{{couponData.order_total_integral_price}}
</view> </view>

2
components/pay/index.vue
View File

@ -10,7 +10,7 @@
请输入支付密码 请输入支付密码
</view> </view>
<view class="subTitle" v-show="show_subTitle&&show_integral"> <view class="subTitle" v-show="show_subTitle&&show_integral">
扣除积分{{price*integral_cash_time}} 铸源星支付:{{price*integral_cash_time}}
</view> </view>
<view class="subTitle" v-show="show_subTitle&&!show_integral"> <view class="subTitle" v-show="show_subTitle&&!show_integral">
付款{{price}} 付款{{price}}

2
components/payment/index.vue
View File

@ -146,7 +146,7 @@
title: '请选择要支付的订单' title: '请选择要支付的订单'
}); });
if (paytype == 'balance' && parseFloat(number) < parseFloat(that.totalPrice)) return that.$util.Tips({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({ uni.showLoading({
title: '支付中' title: '支付中'
}); });

2
components/productWindow/index.vue
View File

@ -23,7 +23,7 @@
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view v-if="type=='points'" class="points_money"> <view v-if="type=='points'" class="points_money">
<image :src="`${domain}/static/images/jf-point.png`" mode=""></image> <image :src="`${domain}/static/images/jf-point.png`" mode=""></image>
<text class="points-num">{{attr.productSelect.ot_price}}</text>积分 <text v-if="attr.productSelect.price > 0">+{{attr.productSelect.price}}元</text> <text class="points-num">{{attr.productSelect.ot_price}}</text>铸源星 <text v-if="attr.productSelect.price > 0">+{{attr.productSelect.price}}元</text>
<text v-if="limitCount > 0" class="points-limit">限购{{limitCount}}件</text> <text v-if="limitCount > 0" class="points-limit">限购{{limitCount}}件</text>
</view> </view>
<view v-else> <view v-else>

2
components/treasureBox/index.vue
View File

@ -20,7 +20,7 @@
<view class="contents"> <view class="contents">
<image src="@/static/images/jf.png" style="width: 48px;height:48px;" mode=""></image> <image src="@/static/images/jf.png" style="width: 48px;height:48px;" mode=""></image>
<view class="text-black">恭喜您获得</view> <view class="text-black">恭喜您获得</view>
<view class="text-red">{{drawInfo.text}}积分</view> <view class="text-red">{{drawInfo.text}}铸源星</view>
<view class="btn" @click="confirm" v-if="!drawInfo.wheel">开心收下</view> <view class="btn" @click="confirm" v-if="!drawInfo.wheel">开心收下</view>
<view class="btn" @click="goBlind" v-else>继续开盲盒</view> <view class="btn" @click="goBlind" v-else>继续开盲盒</view>
</view> </view>

4
config/app.js
View File

@ -6,11 +6,11 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-' let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://many.shop.lo' //测试 // let httpApi = 'http://192.168.1.107:8080' //测试
let httpApi = 'https://api.tropjoin.com' //生产 let httpApi = 'https://api.tropjoin.com' //生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net // 聊天接口修改此字符 小程序聊天要求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' let wsApi = 'wss://ws.tropjoin.com'
module.exports = { module.exports = {

24
manifest.json
View File

@ -1,9 +1,9 @@
{ {
"name" : "铸源商城", "name" : "铸源优品",
"appid" : "__UNI__496DF55", "appid" : "__UNI__496DF55",
"description" : "", "description" : "",
"versionName" : "1.0.6", "versionName" : "1.0.2",
"versionCode" : 127, "versionCode" : 129,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -27,7 +27,8 @@
"iBeacon" : {}, "iBeacon" : {},
"Geolocation" : {}, "Geolocation" : {},
"Maps" : {}, "Maps" : {},
"Barcode" : {} "Barcode" : {},
"Camera" : {}
}, },
"safearea" : { "safearea" : {
"bottom" : { "bottom" : {
@ -60,21 +61,22 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>" "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
"permissionExternalStorage" : { "permissionExternalStorage" : {
"request" : "none", "request" : "none",
"prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。" "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
}, },
"permissionPhoneState" : { "permissionPhoneState" : {
"request" : "none" //拨打电话权限关闭 "request" : "none" //拨打电话权限关闭
} },
"targetSdkVersion" : 30
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {
"privacyDescription" : { "privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报",
"NSPhotoLibraryAddUsageDescription" : "上传用户头像保存分享海报", "NSPhotoLibraryAddUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报",
"NSCameraUsageDescription" : "上传用户头像保存分享海报", "NSCameraUsageDescription" : "应用需要获取相机相册权限，用于上传资料照片,上传用户头像保存分享海报",
"NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店",
"NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店"
}, },
@ -105,9 +107,7 @@
} }
}, },
"push" : {}, "push" : {},
"oauth" : { "oauth" : {},
"apple" : {}
},
"ad" : {} "ad" : {}
}, },
"icons" : { "icons" : {

8
pages.json
View File

@ -15,7 +15,7 @@
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"navigationStyle": "custom", // "navigationStyle": "custom",
// #ifdef APP-PLUS // #ifdef APP-PLUS
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
// #endif // #endif
@ -257,7 +257,7 @@
{ {
"path": "user_integral/index", "path": "user_integral/index",
"style": { "style": {
"navigationBarTitleText": "积分详情" "navigationBarTitleText": "铸源星详情"
} }
}, },
{ {
@ -1191,7 +1191,7 @@
"style": { "style": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#333333", "navigationBarBackgroundColor": "#333333",
"navigationBarTitleText": "积分商城", "navigationBarTitleText": "铸源星商城",
"app-plus": { "app-plus": {
// #ifdef APP-PLUS // #ifdef APP-PLUS
"titleNView": { "titleNView": {
@ -1247,7 +1247,7 @@
{ {
"path": "integral_order", "path": "integral_order",
"style": { "style": {
"navigationBarTitleText": "积分订单", "navigationBarTitleText": "铸源星订单",
"app-plus": { "app-plus": {
// #ifdef APP-PLUS // #ifdef APP-PLUS
"titleNView": { "titleNView": {

4
pages/admin/orderDetail/index.vue
View File

@ -86,7 +86,7 @@
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>支付方式：</view> <view>支付方式：</view>
<view class="conter">{{ orderInfo.pay_type == 0 ? "余额支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }}</view> <view class="conter">{{ orderInfo.pay_type == 0 ? "消费券支付" : (orderInfo.pay_type == 1 || orderInfo.pay_type == 2 || orderInfo.pay_type == 3) ? "微信支付" : "支付宝支付" }}</view>
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>买家留言：</view> <view>买家留言：</view>
@ -112,7 +112,7 @@
<view class="conter">-￥{{ orderInfo.coupon_price }}</view> <view class="conter">-￥{{ orderInfo.coupon_price }}</view>
</view> </view>
<view v-if="orderInfo.integral_price > 0" class="item acea-row row-between"> <view v-if="orderInfo.integral_price > 0" class="item acea-row row-between">
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class="conter">-￥{{ orderInfo.integral_price }}</view> <view class="conter">-￥{{ orderInfo.integral_price }}</view>
</view> </view>
<view v-if="orderInfo.pay_postage > 0" class="item acea-row row-between"> <view v-if="orderInfo.pay_postage > 0" class="item acea-row row-between">

2
pages/annex/vip_grade/index.vue
View File

@ -21,7 +21,7 @@
</view> </view>
<view class="item"> <view class="item">
<view class="num">{{info.user.integral}}</view> <view class="num">{{info.user.integral}}</view>
<view>积分</view> <view>铸源星</view>
</view> </view>
<view class="item"> <view class="item">
<view class="num">{{ info.level_info.discount　?　parseFloat(info.level_info.discount)/10　:　'0'}}</view> <view class="num">{{ info.level_info.discount　?　parseFloat(info.level_info.discount)/10　:　'0'}}</view>

20
pages/columnGoods/goods_search/index.vue
View File

@ -39,7 +39,7 @@
</view> </view>
</view> </view>
<!--今日热搜模块--> <!--今日热搜模块-->
<view class="search-hot"> <!-- <view class="search-hot">
<scroll-view v-if="isShow" scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation show-scrollbar="true"> <scroll-view v-if="isShow" scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation show-scrollbar="true">
<view v-if="daySearchList.length>0" class="scroll-count"> <view v-if="daySearchList.length>0" class="scroll-count">
<view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}"> <view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}">
@ -68,9 +68,9 @@
</navigator> </navigator>
</view> </view>
</view> </view>
</view> </view> -->
<!--热销排行--> <!--热销排行-->
<view v-for="(item,index) in hotRankList" class="scroll-count"> <!-- <view v-for="(item,index) in hotRankList" class="scroll-count">
<view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}"> <view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}">
<view class="search-title"> <view class="search-title">
<image :src="`${domain}/static/images/search-title-icon.png`" class="title-icon"></image> <image :src="`${domain}/static/images/search-title-icon.png`" class="title-icon"></image>
@ -109,7 +109,7 @@
<text>开启热搜榜</text> <text>开启热搜榜</text>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
<passwordPopup></passwordPopup> <passwordPopup></passwordPopup>
@ -212,15 +212,15 @@
}, },
/*今日热搜*/ /*今日热搜*/
getHotSearchList(){ getHotSearchList(){
getTodayHotSearch().then(res => { // getTodayHotSearch().then(res => {
this.$set(this, 'daySearchList', res.data); // this.$set(this, 'daySearchList', res.data);
}); // });
}, },
/*热销排行*/ /*热销排行*/
getHotRankingList(){ getHotRankingList(){
getHotRanking().then(res => { // getHotRanking().then(res => {
this.$set(this, 'hotRankList', res.data); // this.$set(this, 'hotRankList', res.data);
}); // });
}, },
setHotSearchValue: function(event, key) { setHotSearchValue: function(event, key) {
this.focus = false this.focus = false

4
pages/goods_details/index.vue
View File

@ -46,7 +46,7 @@
</view> </view>
</view> </view>
<view v-if="storeInfo.atmosphere_pic" class='integral_count skeleton-rect'> <view v-if="storeInfo.atmosphere_pic" class='integral_count skeleton-rect'>
<text v-if="storeInfo.max_integral > 0" class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text> <text v-if="storeInfo.max_integral > 0" class='integral'>铸源星最高可抵扣{{storeInfo.max_integral}}元</text>
<text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text> <text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
</view> </view>
<!--无氛围图--> <!--无氛围图-->
@ -82,7 +82,7 @@
</navigator> </navigator>
</view> </view>
<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect'> <view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect'>
<text v-if="storeInfo.max_integral > 0" class='integral'>积分最高可抵扣{{storeInfo.max_integral}}元</text> <text v-if="storeInfo.max_integral > 0" class='integral'>铸源星最高可抵扣{{storeInfo.max_integral}}元</text>
<text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text> <text v-if="storeInfo.delivery_free == 1" class='integral'>包邮</text>
</view> </view>
<view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'> <view v-if="!storeInfo.atmosphere_pic" class='introduce skeleton-rect'>

2
pages/index/index.vue
View File

@ -478,7 +478,7 @@ export default {
this.diyId = options.diyId || 0; this.diyId = options.diyId || 0;
this.preview = options.time ? true : false; this.preview = options.time ? true : false;
// #ifdef APP-PLUS // #ifdef APP-PLUS
that.appVersionConfig(); //APP版本检测 // that.appVersionConfig(); //APP版本检测
// #endif // #endif
that.$nextTick(function() { that.$nextTick(function() {
uni.getSystemInfo({ uni.getSystemInfo({

6
pages/order_details/index.vue
View File

@ -208,7 +208,7 @@
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>支付方式：</view> <view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view> <view class='conter' v-if="orderInfo.pay_type==0">消费券支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view> <view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
</view> </view>
@ -237,7 +237,7 @@
<view class='conter'>-￥{{orderInfo.coupon_price}}</view> <view class='conter'>-￥{{orderInfo.coupon_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-if='orderInfo.integral'> <view class='item acea-row row-between' v-if='orderInfo.integral'>
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class='conter'>-￥{{orderInfo.integral_price}}</view> <view class='conter'>-￥{{orderInfo.integral_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-if="orderInfo.activity_type == 2"> <view class='item acea-row row-between' v-if="orderInfo.activity_type == 2">
@ -362,7 +362,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',

8
pages/order_details/stay.vue
View File

@ -152,7 +152,7 @@
<view class='conter'>-￥{{orderInfo.coupon_price}}</view> <view class='conter'>-￥{{orderInfo.coupon_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-if='orderInfo.integral'> <view class='item acea-row row-between' v-if='orderInfo.integral'>
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class='conter'>-￥{{orderInfo.integral_price}}</view> <view class='conter'>-￥{{orderInfo.integral_price}}</view>
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
@ -221,7 +221,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',
@ -229,10 +229,10 @@
payStatus: this.$store.getters.globalData.yue_pay_status payStatus: this.$store.getters.globalData.yue_pay_status
}, },
{ {
name: "积分兑付", name: "铸源星支付",
icon: "haiyuefont haiyue-jifenduihuan", icon: "haiyuefont haiyue-jifenduihuan",
value: 'integral', value: 'integral',
title: '可用积分:', title: '可用铸源星:',
number: 0, number: 0,
payStatus: this.$store.getters.globalData.integration_pay_open, payStatus: this.$store.getters.globalData.integration_pay_open,
}, },

6
pages/order_pay_status/index.vue
View File

@ -19,7 +19,7 @@
</view> </view>
<view v-if="order_type== 20" class='item acea-row row-between-wrapper'> <view v-if="order_type== 20" class='item acea-row row-between-wrapper'>
<view>兑换方式</view> <view>兑换方式</view>
<view class='itemCom'>积分兑换</view> <view class='itemCom'>铸源星兑换</view>
</view> </view>
<view v-else class='item acea-row row-between-wrapper'> <view v-else class='item acea-row row-between-wrapper'>
<view>支付方式</view> <view>支付方式</view>
@ -28,7 +28,7 @@
<view v-else class='itemCom'>余额</view> <view v-else class='itemCom'>余额</view>
</view> </view>
<view v-if="order_type== 20" class='item acea-row row-between-wrapper'> <view v-if="order_type== 20" class='item acea-row row-between-wrapper'>
<view>支付积分</view> <view>支付铸源星</view>
<view class='itemCom'>{{order_pay_info.integral}}</view> <view class='itemCom'>{{order_pay_info.integral}}</view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
@ -36,7 +36,7 @@
<view class='itemCom'>{{order_pay_info.pay_price}}</view> <view class='itemCom'>{{order_pay_info.pay_price}}</view>
</view> </view>
<view v-if="order_pay_info.give_integral > 0 && order_pay_info.paid" class='item acea-row row-between-wrapper'> <view v-if="order_pay_info.give_integral > 0 && order_pay_info.paid" class='item acea-row row-between-wrapper'>
<view>赠送积分</view> <view>赠送铸源星</view>
<view class='itemCom t-color'>{{order_pay_info.give_integral}}</view> <view class='itemCom t-color'>{{order_pay_info.give_integral}}</view>
</view> </view>
<!--失败时加上这个 --> <!--失败时加上这个 -->

2
pages/points_mall/exchange_record.vue
View File

@ -87,7 +87,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',

2
pages/points_mall/goods_selection.vue
View File

@ -26,7 +26,7 @@
<view class="count"> <view class="count">
<image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image> <image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image>
<view class="price-box"> <view class="price-box">
<text>{{ item.ot_price }}</text>积分 <text>{{ item.ot_price }}</text>铸源星
</view> </view>
<view v-if="item.price>0" class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view> <view v-if="item.price>0" class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view>
</view> </view>

6
pages/points_mall/index.vue
View File

@ -58,7 +58,7 @@
<view class="acea-row price-count"> <view class="acea-row price-count">
<image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image> <image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image>
<view class="price-box"> <view class="price-box">
<text>{{ item.ot_price }}</text>积分 <text>{{ item.ot_price }}</text>铸源星
</view> </view>
<view class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view> <view class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view>
</view> </view>
@ -139,7 +139,7 @@
} }
return newArray; return newArray;
}, },
// 获取积分区间 // 获取铸源星区间
getIntegralScope() { getIntegralScope() {
getIntegralScope().then(res => { getIntegralScope().then(res => {
res.data.unshift({title: '全部',group_data_id: '',min: '',max: ''}) res.data.unshift({title: '全部',group_data_id: '',min: '',max: ''})
@ -167,7 +167,7 @@
this.goodList = []; this.goodList = [];
this.getIntegralGoods(); this.getIntegralGoods();
}, },
//积分商品列表 //铸源星商品列表
getIntegralGoods(){ getIntegralGoods(){
let that = this; let that = this;
if (that.loadend) return; if (that.loadend) return;

4
pages/points_mall/integral_goods_details.vue
View File

@ -19,7 +19,7 @@
<image :src="`${domain}/static/images/jf-point.png`" mode=""></image> <image :src="`${domain}/static/images/jf-point.png`" mode=""></image>
<view class="price-count"> <view class="price-count">
<text class="num">{{storeInfo.ot_price || 0}}</text> <text class="num">{{storeInfo.ot_price || 0}}</text>
<text>积分</text><text v-if="storeInfo.price > 0">+{{storeInfo.price}}元</text> <text>铸源星</text><text v-if="storeInfo.price > 0">+{{storeInfo.price}}元</text>
</view> </view>
</view> </view>
@ -62,7 +62,7 @@
<view class='footer acea-row row-between-wrapper'> <view class='footer acea-row row-between-wrapper'>
<navigator hover-class="none" class="item" url="/pages/points_mall/index"> <navigator hover-class="none" class="item" url="/pages/points_mall/index">
<view class="iconfont icon-jifenshangcheng"></view> <view class="iconfont icon-jifenshangcheng"></view>
<view class="p_center">积分商城</view> <view class="p_center">铸源星商城</view>
</navigator> </navigator>
<view class="bnt acea-row" <view class="bnt acea-row"

4
pages/points_mall/integral_goods_list.vue
View File

@ -13,7 +13,7 @@
<view class='nav acea-row row-middle'> <view class='nav acea-row row-middle'>
<view class='item line1' :class="{'font-num': where.order==''}" @click.native='set_where(1)'>默认</view> <view class='item line1' :class="{'font-num': where.order==''}" @click.native='set_where(1)'>默认</view>
<view class='item' :class="{'font-num': where.order=='ot_price_desc' || where.order=='ot_price_asc'}" @click='set_where(2)'> <view class='item' :class="{'font-num': where.order=='ot_price_desc' || where.order=='ot_price_asc'}" @click='set_where(2)'>
积分 铸源星
<image v-if="price==1" :src="domain+'/static/diy/up'+keyColor+'.png'"></image> <image v-if="price==1" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
<image v-else-if="price==2" :src="domain+'/static/diy/down'+keyColor+'.png'"></image> <image v-else-if="price==2" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
<image v-else :src='`${domain}/static/images/horn.png`'></image> <image v-else :src='`${domain}/static/images/horn.png`'></image>
@ -35,7 +35,7 @@
<view class="acea-row price-count"> <view class="acea-row price-count">
<image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image> <image class="image" :src="`${domain}/static/images/jf-point.png`" mode="widthFix"></image>
<view class="price-box"> <view class="price-box">
<text>{{ item.ot_price }}</text>积分 <text>{{ item.ot_price }}</text>铸源星
</view> </view>
<view v-if="item.price!=0" class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view> <view v-if="item.price!=0" class="sales">+{{parseFloat(Number(item.price).toFixed(2))}}元</view>
</view> </view>

22
pages/points_mall/integral_order.vue
View File

@ -40,7 +40,7 @@
<view class="price acea-row row-between"> <view class="price acea-row row-between">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<block> <block>
{{goods.productAttr.ot_price}}积分<block v-if="goods.productAttr.price>0">+{{goods.productAttr.price}}元</block> {{goods.productAttr.ot_price}}铸源星<block v-if="goods.productAttr.price>0">+{{goods.productAttr.price}}元</block>
</block> </block>
</view> </view>
@ -57,13 +57,13 @@
</view> </view>
<view class='wrapper'> <view class='wrapper'>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>可用积分</view> <view>可用铸源星</view>
<view class='discount'>{{resData.true_integral}}积分 <view class='discount'>{{resData.true_integral}}铸源星
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>兑换积分</view> <view>兑换铸源星</view>
<view class='discount'>{{resData.order_total_integral}}积分 <view class='discount'>{{resData.order_total_integral}}铸源星
</view> </view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
@ -125,7 +125,7 @@
<view style='height:120rpx;'></view> <view style='height:120rpx;'></view>
<view class='footer acea-row row-between-wrapper'> <view class='footer acea-row row-between-wrapper'>
<view>支付： <view>支付：
<text class='color-t'>{{resData.order_total_integral || 0}}积分</text><text class="color-t" v-if="resData.order_pay_price>0">+{{resData.order_pay_price}}元</text> <text class='color-t'>{{resData.order_total_integral || 0}}铸源星</text><text class="color-t" v-if="resData.order_pay_price>0">+{{resData.order_pay_price}}元</text>
</view> </view>
<view class='settlement' style='z-index:100' @tap="goPay">立即兑换</view> <view class='settlement' style='z-index:100' @tap="goPay">立即兑换</view>
</view> </view>
@ -188,7 +188,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
"name": "余额支付", "name": "消费券支付",
"icon": "icon-icon-test", "icon": "icon-icon-test",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',
@ -219,10 +219,10 @@
mark: '', //备注信息 mark: '', //备注信息
couponTitle: '请选择', //优惠券 couponTitle: '请选择', //优惠券
coupon_price: 0, //优惠券抵扣金额 coupon_price: 0, //优惠券抵扣金额
useIntegral: false, //是否使用积分 useIntegral: false, //是否使用铸源星
integral_price: 0, //积分抵扣金额 integral_price: 0, //铸源星抵扣金额
integral: 0, integral: 0,
ChangePrice: 0, //使用积分抵扣变动后的金额 ChangePrice: 0, //使用铸源星抵扣变动后的金额
formIds: [], //收集formid formIds: [], //收集formid
status: 0, status: 0,
is_address: false, is_address: false,
@ -345,7 +345,7 @@
} }
if (parseFloat(that.resData.true_integral) < parseFloat(that.resData.order_total_integral)) if (parseFloat(that.resData.true_integral) < parseFloat(that.resData.order_total_integral))
return that.$util.Tips({ return that.$util.Tips({
title: '积分不足！' title: '铸源星不足！'
}); });
data = { data = {

8
pages/points_mall/integral_order_details.vue
View File

@ -42,7 +42,7 @@
</view> </view>
<view class='attr line1'>{{item.cart_info.productAttr.sku || '默认'}}</view> <view class='attr line1'>{{item.cart_info.productAttr.sku || '默认'}}</view>
<view class='money'> <view class='money'>
{{item.integral}}积分 <text v-if="item.product_price > 0">+{{item.product_price}}元</text> {{item.integral}}铸源星 <text v-if="item.product_price > 0">+{{item.product_price}}元</text>
</view> </view>
</view> </view>
</view> </view>
@ -84,8 +84,8 @@
<view class='conter'>{{orderInfo.paid == 1 ? '已支付' : '未支付'}}</view> <view class='conter'>{{orderInfo.paid == 1 ? '已支付' : '未支付'}}</view>
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>支付积分：</view> <view>支付铸源星：</view>
<view class='conter'>{{orderInfo.integral}}积分</view> <view class='conter'>{{orderInfo.integral}}铸源星</view>
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>支付金额：</view> <view>支付金额：</view>
@ -172,7 +172,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',

4
pages/points_mall/integral_order_status.vue
View File

@ -18,10 +18,10 @@
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>兑换方式</view> <view>兑换方式</view>
<view class='itemCom'>积分兑换</view> <view class='itemCom'>铸源星兑换</view>
</view> </view>
<view class='item acea-row row-between-wrapper'> <view class='item acea-row row-between-wrapper'>
<view>兑换积分</view> <view>兑换铸源星</view>
<view class='itemCom'>{{order_pay_info.total_price}}</view> <view class='itemCom'>{{order_pay_info.total_price}}</view>
</view> </view>
<!--失败时加上这个 --> <!--失败时加上这个 -->

2
pages/points_mall/logistics_details.vue
View File

@ -8,7 +8,7 @@
<view class='text acea-row row-between'> <view class='text acea-row row-between'>
<view class='name line2'>{{orderInfo.store_name}}</view> <view class='name line2'>{{orderInfo.store_name}}</view>
<view class='money'> <view class='money'>
<view>{{orderInfo.total_price}}积分</view> <view>{{orderInfo.total_price}}铸源星</view>
<view>x{{orderInfo.total_num}}</view> <view>x{{orderInfo.total_num}}</view>
</view> </view>
</view> </view>

7
pages/product/goodsOnSale/index.vue
View File

@ -53,9 +53,10 @@
<view class="shop_list_item_handle"> <view class="shop_list_item_handle">
<view v-if="item.is_show == 1 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">下架</view> <view v-if="item.is_show == 1 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">下架</view>
<view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view> <view v-if="item.is_show == 0 && item.status == 1 && type != 5" class="shop_button" @click="upperShelfAndLowerShelf(item, index)">上架</view>
<view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view> <navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'" class="shop_button" hover-class='none'>预览</navigator>
<view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view> <!-- <view class="shop_button" v-if="type != 1 && type != 3" @click="handleDelete(item, index)">删除</view> -->
<navigator :url="`/pages/product/addGoods/index?mer_id=${merId}&product_id=${item.product_id}`" v-if="type != 5" class="shop_button" hover-class="none">编辑</navigator> <!-- <view class="shop_button" v-if="type == 5" @click="reduction(item, index)">恢复</view> -->
<!-- <navigator :url="`/pages/product/addGoods/index?mer_id=${merId}&product_id=${item.product_id}`" v-if="type != 5" class="shop_button" hover-class="none">编辑</navigator> -->
</view> </view>
</view> </view>
</view> </view>

14
pages/product/list/index.vue
View File

@ -16,7 +16,7 @@
<block> <block>
<swiper-item :class="{ active: 0 == swiperCur }"> <swiper-item :class="{ active: 0 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
<!-- <view class="item" hover-class='none' @click="jumpAddGoods"> <!-- <view class="item" hover-class='none' @click="jumpAddGoods">
<image mode='widthFix' class="image" src="../static/images/product_add.png"></image> <image mode='widthFix' class="image" src="../static/images/product_add.png"></image>
<text class="text">添加商品</text> <text class="text">添加商品</text>
</view> --> </view> -->
@ -24,7 +24,7 @@
<image mode='widthFix' class="image" src="../static/images/product_sales.png"></image> <image mode='widthFix' class="image" src="../static/images/product_sales.png"></image>
<text class="text">在售商品</text> <text class="text">在售商品</text>
</navigator> </navigator>
<navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`" hover-class='none'> <!-- <navigator class="item" :url="`/pages/product/goodsOnSale/index?mer_id=${mer_id}&type=3`" hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_out.png"></image> <image mode='widthFix' class="image" src="../static/images/product_out.png"></image>
<text class="text">售罄商品</text> <text class="text">售罄商品</text>
</navigator> </navigator>
@ -39,10 +39,10 @@
<navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" hover-class='none'> <navigator class="item" :url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`" hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_freight.png"></image> <image mode='widthFix' class="image" src="../static/images/product_freight.png"></image>
<text class="text">运费模板</text> <text class="text">运费模板</text>
</navigator> </navigator> -->
</view> </view>
</swiper-item> </swiper-item>
<swiper-item :class="{ active: 1 == swiperCur }"> <!-- <swiper-item :class="{ active: 1 == swiperCur }">
<view class="slide-navigator"> <view class="slide-navigator">
<navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`" hover-class='none'> <navigator class="item" :url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`" hover-class='none'>
@ -50,7 +50,7 @@
<text class="text">规格模板</text> <text class="text">规格模板</text>
</navigator> </navigator>
</view> </view>
</swiper-item> </swiper-item> -->
</block> </block>
</swiper> </swiper>
</div> </div>
@ -86,8 +86,8 @@
<view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架</view> <view v-if="item.is_show == 0 && item.status == 1" class="bnt" @tap.stop="handleShelves(item),1">上架</view>
<!-- <view @click="editGoods(item)" class="bnt">编辑</view> --> <!-- <view @click="editGoods(item)" class="bnt">编辑</view> -->
<navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'" class="bnt" hover-class='none'>预览</navigator> <navigator :url="'/pages/admin/goods_details/index?product_id='+item.product_id+'&product_type=0'" class="bnt" hover-class='none'>预览</navigator>
<view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除</view> <!-- <view class="bnt" v-if="item.is_show == 0" @tap.stop="handleRecycle(item,index)">删除</view> -->
<view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">{{item.is_good ? '取消推荐' : '店铺推荐'}}</view> <!-- <view class="bnt bnt_recommend" v-if="item.is_show == 1" @tap.stop="handleRecommend(item)">{{item.is_good ? '取消推荐' : '店铺推荐'}}</view> -->
</view> </view>
</view> </view>
</block> </block>

4
pages/store/merchantDetails/index.vue
View File

@ -14,7 +14,7 @@
<view class="phone"> <view class="phone">
<view class=""> <view class="">
<text class="head">商户账号：</text> <text class="head">商户账号：</text>
<text class="content">{{resData.mer_name}}</text> <text class="content">{{resData.mer_account}}</text>
</view> </view>
<text class="cope" @click="copyTBL()">复制</text> <text class="cope" @click="copyTBL()">复制</text>
</view> </view>
@ -50,7 +50,7 @@
}) })
}, },
copyTBL(url) { 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 // #ifdef MP || APP-PLUS
uni.setClipboardData({ uni.setClipboardData({
data: copeData, data: copeData,

6
pages/store/settled/index.vue
View File

@ -626,7 +626,11 @@
*/ */
uploadpic(item) { uploadpic(item) {
let that = this; 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); item.push(res.data.path);
that.validateBtn(); that.validateBtn();
// that.$set(that, 'pics', that.pics); // that.$set(that, 'pics', that.pics);

48
pages/store/settled/step2.vue
View File

@ -29,7 +29,7 @@
<view class="uni-list"> <view class="uni-list">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name required">身份证正、反面及法人手持身份证清晰照片</text> <text class="item-name required" style="min-height: 72rpx;">身份证正、反面及法人手持身份证清晰照片</text>
<view class=""> <view class="">
{{shopInfo.idCardPhoto.length}}/3 {{shopInfo.idCardPhoto.length}}/3
</view> </view>
@ -204,10 +204,25 @@
<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text> <text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
</view> </view>
</view> </view>
<view class="item">
<view class="uni-list">
<view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle">
<text class="item-name required">营业执照注册地址</text>
<view class="acea-row row-middle" @click="changeRegion">
<input style="pointer-events:none;text-align: right;" placeholder="请选择"
type="text" readonly disabled v-model="shopInfo.registerAddress">
<view class='iconfont icon-jiantou'></view>
</view>
</view>
</view>
</view>
</view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="item-name required">营业执照注册地址</text> <input type="text" style="text-align: right;flex:1;" placeholder="请输入详细地址" v-model="shopInfo.registerAddressDetail" @input="validateBtn" placeholder-class='placeholder' />
<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.registerAddressDetail" @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
</view> </view>
<!-- <view class="item"> <!-- <view class="item">
@ -234,7 +249,7 @@
</view> </view>
<areaWindow ref="areaWindow" :display="display" :address="[]" <areaWindow ref="areaWindow" :display="display" :address="[]"
@submit="OnChangeAddress" @changeClose="changeClose" :cityShow="1"></areaWindow> @submit="OnChangeAddress" @changeClose="changeClose" :cityShow="2"></areaWindow>
<areaWindow ref="areaWindow2" :display="display2" :address="[]" <areaWindow ref="areaWindow2" :display="display2" :address="[]"
@submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow> @submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow>
</view> </view>
@ -268,6 +283,7 @@
countEndTime:'', countEndTime:'',
businessScope:'', businessScope:'',
registerAddressDetail:'', registerAddressDetail:'',
registerAddress:''
}, },
successful: false, successful: false,
isType: false, isType: false,
@ -366,12 +382,12 @@
return regex.test(dateString); return regex.test(dateString);
}, },
getGoodsDetails(){ getGoodsDetails(){
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo; let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail,registerAddress}=this.shopInfo;
let data2=uni.getStorageSync('updateShopInfo'); let data2=uni.getStorageSync('updateShopInfo');
let idcard=data2.idcard; let idcard=data2.idcard;
let biz=data2.biz; let biz=data2.biz;
idCardPhoto=[idcard.image1,idcard.image2,idcard.image3],idCardName=idcard.name,idCardNumber=idcard.number,idCardStartTime=idcard.start,idCardEndTime=idcard.end,businessLicense=biz.image,countId=biz.number,countStartTime=biz.start,countEndTime=biz.end,registerAddressDetail=biz.address,businessScope=biz.businessScope idCardPhoto=[idcard.image1,idcard.image2,idcard.image3],idCardName=idcard.name,idCardNumber=idcard.number,idCardStartTime=idcard.start,idCardEndTime=idcard.end,businessLicense=biz.image,countId=biz.number,countStartTime=biz.start,countEndTime=biz.end,registerAddress=biz.cityInfo,registerAddressDetail=biz.address,businessScope=biz.businessScope
this.shopInfo={idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}; this.shopInfo={idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail,registerAddress};
uni.hideLoading(); uni.hideLoading();
this.validateBtn(); this.validateBtn();
}, },
@ -396,6 +412,7 @@
this.shopInfo.countId=res.data.result.creditno; this.shopInfo.countId=res.data.result.creditno;
this.shopInfo.countStartTime=res.data.result.start; this.shopInfo.countStartTime=res.data.result.start;
this.shopInfo.countEndTime=res.data.result.end; this.shopInfo.countEndTime=res.data.result.end;
this.shopInfo.registerAddressDetail=res.data.result.regaddress;
}) })
}, },
getAgreement() { getAgreement() {
@ -421,8 +438,8 @@
this.display2 = false; this.display2 = false;
}, },
OnChangeAddress(address){ OnChangeAddress(address){
this.shopInfo.registerAddress = address.map(v=>v.name).join('');
this.shopInfo.registerAddress = address.map(v=>v.name).join('/'); this.validateBtn()
}, },
OnChangeAddress2(address){ OnChangeAddress2(address){
@ -431,8 +448,8 @@
validateBtn(){ validateBtn(){
console.log(this.shopInfo) console.log(this.shopInfo)
let data2=uni.getStorageSync('shopInfo'); let data2=uni.getStorageSync('shopInfo');
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo; let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,registerAddress,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&registerAddressDetail){ if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&registerAddress&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&registerAddressDetail){
let idcard={ let idcard={
image1:idCardPhoto[0], image1:idCardPhoto[0],
image2:idCardPhoto[1], image2:idCardPhoto[1],
@ -447,6 +464,7 @@
biz.number=countId; biz.number=countId;
biz.start=countStartTime; biz.start=countStartTime;
biz.end=countEndTime; biz.end=countEndTime;
biz.cityInfo=registerAddress
biz.address=registerAddressDetail; biz.address=registerAddressDetail;
biz.businessScope=businessScope; biz.businessScope=businessScope;
data2.idcard=idcard; data2.idcard=idcard;
@ -525,7 +543,11 @@
uploadpic: function(item) { uploadpic: function(item) {
let that = this; let that = this;
console.log(item); console.log(item);
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); item.push(res.data.path);
}); });
}, },
@ -594,7 +616,7 @@
} }
.item-name{ .item-name{
width: 340rpx; width: 340rpx;
min-height: 72rpx; // min-height: 72rpx;
} }
.uni-list-cell { .uni-list-cell {
position: relative; position: relative;

9
pages/store/settled/step3.vue
View File

@ -134,6 +134,9 @@
@submit="OnChangeAddress" @changeClose="changeClose" :cityShow="1"></areaWindow> @submit="OnChangeAddress" @changeClose="changeClose" :cityShow="1"></areaWindow>
<areaWindow ref="areaWindow2" :display="display2" :address="[]" <areaWindow ref="areaWindow2" :display="display2" :address="[]"
@submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow> @submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow>
<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
</view>
</view> </view>
<view class="settledSuccessMain" v-else :style="viewColor"> <view class="settledSuccessMain" v-else :style="viewColor">
<view class="settledSuccessful"> <view class="settledSuccessful">
@ -371,7 +374,11 @@
*/ */
uploadpic(item) { uploadpic(item) {
let that = this; 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); item.push(res.data.path);
// that.$set(that, 'pics', that.pics); // that.$set(that, 'pics', that.pics);
}); });

10
pages/store/shopStreet/index.vue
View File

@ -227,12 +227,12 @@
title: '好评', title: '好评',
key: 2, key: 2,
order: 'rate' order: 'rate'
},
{
title: '距离',
key: 3,
order: 'location'
} }
// {
// title: '距离',
// key: 3,
// order: 'location'
// }
], ],
// 是否第一个 // 是否第一个
firstKey: 0, firstKey: 0,

4
pages/user/index.vue
View File

@ -84,10 +84,10 @@
<text class="num">{{userInfo.member_value || 0}}</text> <text class="num">{{userInfo.member_value || 0}}</text>
<view class="txt">成长值</view> <view class="txt">成长值</view>
</view> --> </view> -->
<view class="num-item" > <!-- <view class="num-item" >
<text class="num">{{userInfo.member_value || 0}}</text> <text class="num">{{userInfo.member_value || 0}}</text>
<view class="txt">累积成长值</view> <view class="txt">累积成长值</view>
</view> </view> -->
</view> </view>
<view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1"> <view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1">
<image class="svip_user" :src="`${domain}/static/images/svip_user.png`"></image> <image class="svip_user" :src="`${domain}/static/images/svip_user.png`"></image>

2
pages/users/goods_logistics/index.vue
View File

@ -10,7 +10,7 @@
<view class='name line1'>{{product.cart_info.product.store_name}}</view> <view class='name line1'>{{product.cart_info.product.store_name}}</view>
<view class="sku">{{product.cart_info.productAttr.sku}}</view> <view class="sku">{{product.cart_info.productAttr.sku}}</view>
<view class='money'> <view class='money'>
<view v-if="orderInfo.activity_type == 20">{{product.cart_info.productAttr.ot_price}}个积分 <block v-if="product.cart_info.productAttr.price>0">+{{product.cart_info.productAttr.price}}元</block></view> <view v-if="orderInfo.activity_type == 20">{{product.cart_info.productAttr.ot_price}}个铸源星 <block v-if="product.cart_info.productAttr.price>0">+{{product.cart_info.productAttr.price}}元</block></view>
<view v-else>￥{{product.product_price}}</view> <view v-else>￥{{product.product_price}}</view>
</view> </view>
</view> </view>

8
pages/users/login/index.vue
View File

@ -58,7 +58,7 @@
</checkbox-group> </checkbox-group>
</div> </div>
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<view class="appLogin" v-if="wechat_phone_switch == 1 || appleShow"> <!-- <view class="appLogin" v-if="wechat_phone_switch == 1 || appleShow">
<view class="hds"> <view class="hds">
<span class="line"></span> <span class="line"></span>
<p>其他方式登录</p> <p>其他方式登录</p>
@ -72,7 +72,7 @@
<span class="iconfont icon-s-pingguo"></span> <span class="iconfont icon-s-pingguo"></span>
</view> </view>
</view> </view>
</view> </view> -->
<!-- #endif --> <!-- #endif -->
</div> </div>
<div class="whiteBg" v-else> <div class="whiteBg" v-else>
@ -109,7 +109,7 @@
</checkbox-group> </checkbox-group>
</div> </div>
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus"> <!-- <view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
<view class="hds"> <view class="hds">
<span class="line"></span> <span class="line"></span>
<p>其他方式登录</p> <p>其他方式登录</p>
@ -123,7 +123,7 @@
<span class="iconfont icon-s-pingguo"></span> <span class="iconfont icon-s-pingguo"></span>
</view> </view>
</view> </view>
</view> </view> -->
<!-- #endif --> <!-- #endif -->
</div> </div>
<div class="bottom"></div> <div class="bottom"></div>

18
pages/users/order_confirm/index.vue
View File

@ -402,10 +402,10 @@
<view class='money'>-￥{{coupon_price}}</view> <view class='money'>-￥{{coupon_price}}</view>
</view> </view>
<view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0"> <view class='item acea-row row-between-wrapper' v-if="open_integral && userInfo.integral>0 && order_type == 0">
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class='money'> <view class='money'>
<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text> <text v-if="!use_integral">当前铸源星<text class="pColor">{{userInfo.integral}}</text></text>
<text v-else>使用了{{integral_count}}个积分，抵扣<text <text v-else>使用了{{integral_count}}个铸源星，抵扣<text
class="pColor">{{integral_price}}元</text></text> class="pColor">{{integral_price}}元</text></text>
<view class="checkbox integral_checked" @click="changeIntegral"> <view class="checkbox integral_checked" @click="changeIntegral">
<view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view> <view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view>
@ -437,7 +437,7 @@
<view class="footer_count"> <view class="footer_count">
<view> <view>
合计: 合计:
<text class='pColor' v-if="payType=='integral'">扣除积分{{totalPrice*userInfo.integral_cash_time}}</text> <text class='pColor' v-if="payType=='integral'">扣除铸源星{{totalPrice*userInfo.integral_cash_time}}</text>
<text class='pColor' v-else>￥{{totalPrice || 0}}</text> <text class='pColor' v-else>￥{{totalPrice || 0}}</text>
</view> </view>
<view class="coupon_price" v-if="couponData.total_coupon > 0"> <view class="coupon_price" v-if="couponData.total_coupon > 0">
@ -557,17 +557,17 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
"name": "余额支付", "name": "消费券支付",
"icon": "icon-icon-test", "icon": "icon-icon-test",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',
payStatus: this.$store.getters.globalData.yue_pay_status, payStatus: this.$store.getters.globalData.yue_pay_status,
}, },
{ {
"name": "积分兑付", "name": "铸源星支付",
"icon": "haiyuefont haiyue-jifenduihuan", "icon": "haiyuefont haiyue-jifenduihuan",
value: 'integral', value: 'integral',
title: '可用积分:', title: '可用铸源星:',
payStatus: this.$store.getters.globalData.integration_pay_open, payStatus: this.$store.getters.globalData.integration_pay_open,
}, },
{ {
@ -627,8 +627,8 @@
mark: '', //备注信息 mark: '', //备注信息
couponTitle: '请选择', //优惠券 couponTitle: '请选择', //优惠券
coupon_price: 0, //优惠券抵扣金额 coupon_price: 0, //优惠券抵扣金额
useIntegral: false, //是否使用积分 useIntegral: false, //是否使用铸源星
integral_price: 0, //积分抵扣金额 integral_price: 0, //铸源星抵扣金额
integral: 0, integral: 0,
status: 0, status: 0,
is_address: false, is_address: false,

6
pages/users/order_list/index.vue
View File

@ -307,7 +307,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',
@ -315,10 +315,10 @@
payStatus: this.$store.getters.globalData.yue_pay_status payStatus: this.$store.getters.globalData.yue_pay_status
}, },
{ {
name: "积分兑付", name: "铸源星支付",
icon: "haiyuefont haiyue-jifenduihuan", icon: "haiyuefont haiyue-jifenduihuan",
value: 'integral', value: 'integral',
title: '可用积分:', title: '可用铸源星:',
number: 0, number: 0,
payStatus: this.$store.getters.globalData.integration_pay_open, payStatus: this.$store.getters.globalData.integration_pay_open,
}, },

2
pages/users/order_list/search.vue
View File

@ -255,7 +255,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',

2
pages/users/presell_order_list/index.vue
View File

@ -107,7 +107,7 @@
payStatus: this.$store.getters.globalData.alipay_open payStatus: this.$store.getters.globalData.alipay_open
}, },
{ {
name: "余额支付", name: "消费券支付",
icon: "icon-yuezhifu", icon: "icon-yuezhifu",
value: 'balance', value: 'balance',
title: '可用余额:', title: '可用余额:',

10
pages/users/user_grade/index.vue
View File

@ -21,7 +21,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="next_level" class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'"> <!-- <view v-if="next_level" class="card-wrapper" :style="'background-image: url('+brokerage_bg+')'">
<view class="growth"> <view class="growth">
<view class="info">今日获得成长值{{growthValue}}点</view> <view class="info">今日获得成长值{{growthValue}}点</view>
</view> </view>
@ -33,7 +33,7 @@
</view> </view>
<view class="progress"><text class="current_value" :style="'width:'+curPercent+'%'"></text></view> <view class="progress"><text class="current_value" :style="'width:'+curPercent+'%'"></text></view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="grade_main"> <view class="grade_main">
<view v-if="gradeList.length > 0" class="grade_privilege"> <view v-if="gradeList.length > 0" class="grade_privilege">
@ -62,12 +62,12 @@
<view class="upgrade-svip acea-row"> <view class="upgrade-svip acea-row">
<view class="svip-view acea-row"> <view class="svip-view acea-row">
<image src="../static/images/upgrade_icon.png"></image> <image src="../static/images/upgrade_icon.png"></image>
<text>{{userInfo.is_svip > 0 && svip_switch_status == 1 ? 'SVIP 会员中心，惊喜多多！' : '升级成为SVIP，成长值奖励可翻倍哦！'}}</text> <!-- <text>{{userInfo.is_svip > 0 && svip_switch_status == 1 ? 'SVIP 会员中心，惊喜多多！' : '升级成为SVIP，成长值奖励可翻倍哦！'}}</text> -->
</view> </view>
<navigator v-if="userInfo.is_svip > 0 && svip_switch_status == 1" url="/pages/annex/vip_center/index" class="svip-btn" hover-class="none">去看看<text class="iconfont icon-jinru2"></text></navigator> <navigator v-if="userInfo.is_svip > 0 && svip_switch_status == 1" url="/pages/annex/vip_center/index" class="svip-btn" hover-class="none">去看看<text class="iconfont icon-jinru2"></text></navigator>
<navigator v-else url="/pages/annex/vip_paid/index" class="svip-btn" hover-class="none">立即开通<text class="iconfont icon-jinru2"></text></navigator> <navigator v-else url="/pages/annex/vip_paid/index" class="svip-btn" hover-class="none">立即开通<text class="iconfont icon-jinru2"></text></navigator>
</view> </view>
<view class="upgrade-main"> <!-- <view class="upgrade-main">
<view class="item acea-row row-between-wrapper"> <view class="item acea-row row-between-wrapper">
<view class="item-icon"><text class="iconfont icon-qiandao"></text></view> <view class="item-icon"><text class="iconfont icon-qiandao"></text></view>
<view> <view>
@ -117,7 +117,7 @@
</view> </view>
<navigator class="get_btn" hover-class='none' url='/pages/plantGrass/plant_release/index'>去完成</navigator> <navigator class="get_btn" hover-class='none' url='/pages/plantGrass/plant_release/index'>去完成</navigator>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
<view class='hotList'> <view class='hotList'>

24
pages/users/user_integral/index.vue
View File

@ -2,13 +2,13 @@
<view :style="viewColor"> <view :style="viewColor">
<view class='integral-details'> <view class='integral-details'>
<view class='header'> <view class='header'>
<view class='currentScore'>当前积分 <text @click="showProtocol=true" class="iconfont wenhao">?</text></view> <view class='currentScore'>当前铸源星 <text @click="showProtocol=true" class="iconfont wenhao">?</text></view>
<view class="scoreNum">{{userInfo.integral ? userInfo.integral : 0}}</view> <view class="scoreNum">{{userInfo.integral ? userInfo.integral : 0}}</view>
<view class='line'></view> <view class='line'></view>
<view class='nav acea-row'> <view class='nav acea-row'>
<view class='item'> <view class='item'>
<view class='num'>{{userInfo.totalGainIntegral || 0}}</view> <view class='num'>{{userInfo.totalGainIntegral || 0}}</view>
<view>累计积分</view> <view>累计铸源星</view>
</view> </view>
<view class='item'> <view class='item'>
<view class='num'>{{userInfo.deductionIntegral || 0}}</view> <view class='num'>{{userInfo.deductionIntegral || 0}}</view>
@ -16,7 +16,7 @@
</view> </view>
<view class='item'> <view class='item'>
<view class='num'>{{userInfo.lockIntegral || 0}}</view> <view class='num'>{{userInfo.lockIntegral || 0}}</view>
<view>冻结积分</view> <view>冻结铸源星</view>
</view> </view>
</view> </view>
</view> </view>
@ -27,7 +27,7 @@
</view> </view>
<view class='list' :hidden='current != 0' v-if="current == 0" > <view class='list' :hidden='current != 0' v-if="current == 0" >
<view class='tip' v-if="userInfo.clear && userInfo.clear.status && userInfo.clear.nextClearIntegral > 0"><text class='iconfont icon-shuoming'></text> <view class='tip' v-if="userInfo.clear && userInfo.clear.status && userInfo.clear.nextClearIntegral > 0"><text class='iconfont icon-shuoming'></text>
<text class="tip-text">提示：您有部分积分将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text> <text class="tip-text">提示：您有部分铸源星将于{{userInfo.clear.nextClearDay}}过期，请尽快使用！</text>
</view> </view>
<view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index"> <view class='item acea-row row-between-wrapper' v-for="(item,index) in integralList" :key="index">
<view> <view>
@ -41,7 +41,7 @@
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view> </view>
<view v-if="integralList.length == 0"> <view v-if="integralList.length == 0">
<emptyPage title="暂无积分记录哦～"></emptyPage> <emptyPage title="暂无铸源星记录哦～"></emptyPage>
</view> </view>
</view> </view>
<view v-else class='list2' :hidden='current==0'> <view v-else class='list2' :hidden='current==0'>
@ -58,8 +58,8 @@
<input type="text" placeholder="请输入身份证" v-model="presentExp.card_id"/> <input type="text" placeholder="请输入身份证" v-model="presentExp.card_id"/>
</view> </view>
<view class="list-item"> <view class="list-item">
<text>积分</text> <text>铸源星</text>
<input type="number" placeholder="请输入积分" v-model="presentExp.integral"/> <input type="number" placeholder="请输入铸源星" v-model="presentExp.integral"/>
</view> </view>
<view class="list-btn" @click="giveaway"> <view class="list-btn" @click="giveaway">
确认赠送 确认赠送
@ -70,7 +70,7 @@
<view class="instructions" v-if="showProtocol"> <view class="instructions" v-if="showProtocol">
<view class="setAgCount"> <view class="setAgCount">
<i class="icon iconfont icon-cha" @click="showProtocol = false"></i> <i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
<div class="title">积分说明</div> <div class="title">铸源星说明</div>
<view class="content"> <view class="content">
<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser> <jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
</view> </view>
@ -105,7 +105,7 @@
'status':1, 'status':1,
}, },
{ {
'name': '积分赠送', 'name': '铸源星赠送',
'icon': 'icon-tishengfenzhi', 'icon': 'icon-tishengfenzhi',
'status':this.$store.getters.globalData.integral_give_status, 'status':this.$store.getters.globalData.integral_give_status,
} }
@ -184,7 +184,7 @@
if(integral<=0){ if(integral<=0){
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title: '积分数量必须大于0', title: '铸源星数量必须大于0',
}); });
return return
} }
@ -228,7 +228,7 @@
}); });
}); });
}, },
/*获取积分说明*/ /*获取铸源星说明*/
getAgreement() { getAgreement() {
let that = this let that = this
getAgreementApi('sys_integral_rule').then(res => { getAgreementApi('sys_integral_rule').then(res => {
@ -236,7 +236,7 @@
}) })
}, },
/** /**
* 获取积分明细 * 获取铸源星明细
*/ */
getIntegralList: function() { getIntegralList: function() {
let that = this; let that = this;

4
pages/users/user_invoice_order/index.vue
View File

@ -81,12 +81,12 @@
<view class='conter'>￥{{orderInfo.coupon_price}}</view> <view class='conter'>￥{{orderInfo.coupon_price}}</view>
</view> </view>
<view v-if="orderInfo.integral_price > 0" class='item acea-row row-between'> <view v-if="orderInfo.integral_price > 0" class='item acea-row row-between'>
<view>积分抵扣：</view> <view>铸源星支付：</view>
<view class='conter'>￥{{orderInfo.integral_price}}</view> <view class='conter'>￥{{orderInfo.integral_price}}</view>
</view> </view>
<view class='item acea-row row-between'> <view class='item acea-row row-between'>
<view>支付方式：</view> <view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view> <view class='conter' v-if="orderInfo.pay_type==0">消费券支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>
<view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view> <view class='conter' v-if="orderInfo.pay_type==1 || orderInfo.pay_type==2 || orderInfo.pay_type==3">微信支付</view>
</view> </view>

6
pages/users/user_sgin/index.vue
View File

@ -7,7 +7,7 @@
<view class='pictrue'><image :src='userInfo.avatar ? userInfo.avatar : "/static/images/f.png"'></image></view> <view class='pictrue'><image :src='userInfo.avatar ? userInfo.avatar : "/static/images/f.png"'></image></view>
<view class='text'> <view class='text'>
<view class='line1'>{{userInfo.nickname}}</view> <view class='line1'>{{userInfo.nickname}}</view>
<view class='integral acea-row'><text>积分: {{userInfo.integral ? userInfo.integral : 0}}</text></view> <view class='integral acea-row'><text>铸源星: {{userInfo.integral ? userInfo.integral : 0}}</text></view>
</view> </view>
</view> </view>
<navigator class='right acea-row row-middle' hover-class='none' url='/pages/users/user_sgin_list/index'> <navigator class='right acea-row row-middle' hover-class='none' url='/pages/users/user_sgin_list/index'>
@ -39,7 +39,7 @@
<view class='item'>{{signCount[3] || 0}}</view> <view class='item'>{{signCount[3] || 0}}</view>
<view class='data'>天</view> <view class='data'>天</view>
</view> </view>
<view class='tip2'>据说连续签到第7天可获得超额积分，一定要坚持签到哦~~~</view> <view class='tip2'>据说连续签到第7天可获得超额铸源星，一定要坚持签到哦~~~</view>
<view class='list3'> <view class='list3'>
<view class='item acea-row' v-for="(item,index) in signList" :key="index"> <view class='item acea-row' v-for="(item,index) in signList" :key="index">
<view> <view>
@ -57,7 +57,7 @@
<view class='signTipLight loadingpic'></view> <view class='signTipLight loadingpic'></view>
<view class='signTipCon' :style="'background-image: url('+domain+'/static/diy/signSuccess'+keyColor+'.png)'"> <view class='signTipCon' :style="'background-image: url('+domain+'/static/diy/signSuccess'+keyColor+'.png)'">
<view class='state'>签到成功</view> <view class='state'>签到成功</view>
<view class='integral'>获得{{integral}}积分</view> <view class='integral'>获得{{integral}}铸源星</view>
<view class='signTipBnt' @click='close'>好的</view> <view class='signTipBnt' @click='close'>好的</view>
</view> </view>
</view> </view>