何书鹏 / anttest · 提交

转到一个项目

作者 何书鹏
提交 e3822b539028cba74089daa09a785a9e5ecbc91a 1 个父辈 27c72dab

配置整理

内嵌 并排对比
正在显示 6 个修改的文件 包含 131 行增加 和 7 行删除
... ... @@ -516,6 +516,20 @@ class Goods extends Model
// 减小响应包体积
unset($activity['activity_goods_sku_price']);
}else{
// 会员价
$user = User::info();
if($user && $user->vip_end_time > time()){
$basicConfig = json_decode(\addons\shopro\model\Config::get(['name' => 'user'])->value, true);
$new_sku_price = [];
foreach ($sku_price as $s => $k) {
$new_sku_price[$s] = $k;
$new_sku_price[$s]['price'] = round($k['price'] * $basicConfig['discount'] / 10,2);
}
$sku_price = $new_sku_price;
$detail['price'] = round($detail['price'] * $basicConfig['discount'] / 10,2);
}
}
// 商品参与的活动
... ...
... ... @@ -292,6 +292,28 @@ class Dealer extends Backend
}
/**
* 供货商品
*/
public function goods($id)
{
$skuList = \app\admin\model\shopro\goods\Sku::all(['pid' => 0, 'goods_id' => $id]);
if ($skuList) {
foreach ($skuList as &$s) {
$s->children = \app\admin\model\shopro\goods\Sku::all(['pid' => $s->id, 'goods_id' => $id]);
}
}
$skuPrice = \app\admin\model\shopro\goods\SkuPrice::all(['goods_id' => $id]);
$this->assignconfig('skuList', $skuList);
$this->assignconfig('skuPrice', $skuPrice);
return $this->view->fetch();
}
public function selectpage()
{
return parent::selectpage(); // TODO: Change the autogenerated stub
... ...
... ... @@ -155,6 +155,34 @@
<el-form-item label="商品折扣：">
<el-input v-model="detailForm.discount" placeholder="请输入商品折扣"></el-input>
</el-form-item>
<el-form-item label="开通会员赠送优惠券：" prop="coupon_list">
<el-input style="display: none;" v-model="detailForm.goods_list"></el-input>
<el-button class="choose-coupon" :disabled="disabledFlag" @click="chooseCoupon('activity')">
优惠券选择</el-button>
</el-form-item>
<el-form-item style="margin-bottom: 20px;">
<el-table :data="detailForm.coupon_list" style="width: 100%"
v-if="detailForm.coupon_list.length>0">
<el-table-column label="商品信息" width="320">
<template slot-scope="scope">
<div style="display: flex;">
<span style="width:200px;">{{scope.row.title}}</span>
</div>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<span class="table-good-status cursor-pointer" v-if="activityFormType!='view'"
:class="scope.row.opt?'table-good-status-1':''"
@click="chooseActivityPrice(scope.row.id,scope.$index,encodeURI(scope.row.actSkuPrice))">{{scope.row.opt === 0 ? "设置价格" : "修改价格"}}</span>
<span class="table-good-status cursor-pointer" v-if="activityFormType=='view'"
@click="chooseActivityPrice(scope.row.id,scope.$index,encodeURI(scope.row.actSkuPrice))">查看详情</span>
<span class="table-good-status-delete cursor-pointer" v-if="activityFormType!='view'"
@click="selectDelete(scope.$index)">移除</span>
</template>
</el-table-column>
</el-table>
</el-form-item>
</div>
<div v-if="type=='share'">
<!--<el-form-item label="分享标题：">
... ... @@ -211,6 +239,18 @@
</div>
</div>
</el-form-item>
<el-form-item label="购买会员返1级佣金：" label-width="150px">
<el-input v-model="detailForm.member_first" placeholder="开通会员返一级佣金"></el-input>
</el-form-item>
<el-form-item label="购买会员返2级佣金：" label-width="150px">
<el-input v-model="detailForm.member_second" placeholder="开通会员返二级佣金"></el-input>
</el-form-item>
<el-form-item label="购买商品返1级佣金比例：" label-width="180px">
<el-input v-model="detailForm.order_first" placeholder="下单返一级佣金比例"></el-input>
</el-form-item>
<el-form-item label="购买商品返2级佣金比例：" label-width="180px">
<el-input v-model="detailForm.order_second" placeholder="下单返二级佣金比例"></el-input>
</el-form-item>
<!--<el-form-item label="拼团分享背景：">
<div class="display-flex">
<div class="platform-images" v-if="detailForm.groupon_poster_bg">
... ...
... ... @@ -767,14 +767,14 @@ width: 100%;
<div class="msg-tip">商品没有优惠的情况下售卖的价格</div>
</div>
</el-form-item>
<el-form-item label="划线价格：" prop="original_price">
<!--<el-form-item label="划线价格：" prop="original_price">
<div class="display-flex">
<el-input type="number" v-model="goodsDetail.original_price" style="width:300px">
<template slot="append">元</template>
</el-input>
<div class="msg-tip">划线价在商品列表及详情会以划线形式显示</div>
</div>
</el-form-item>
</el-form-item>-->
<div v-if="goodsDetail.is_sku==0">
<el-form-item label="商品库存：" prop="stock">
<div class="display-flex">
... ...
... ... @@ -754,14 +754,14 @@
<div class="msg-tip">商品没有优惠的情况下售卖的价格</div>
</div>
</el-form-item>
<el-form-item label="划线价格：" prop="original_price">
<!--<el-form-item label="划线价格：" prop="original_price">
<div class="display-flex">
<el-input type="number" v-model="goodsDetail.original_price" style="width:300px">
<template slot="append">元</template>
</el-input>
<div class="msg-tip">划线价在商品列表及详情会以划线形式显示</div>
</div>
</el-form-item>
</el-form-item>-->
<div v-if="goodsDetail.is_sku==0">
<el-form-item label="商品库存：" prop="stock">
<div class="display-flex">
... ...
... ... @@ -37,9 +37,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
},
}, {
id: 'share',
title: '分享配置',
tip: '配置默认分享信息',
message: '分享标题、图片、海报背景',
// title: '分享配置',
// tip: '配置默认分享信息',
// message: '分享标题、图片、海报背景',
title: '分享及分销配置',
tip: '配置默认分享及分销信息',
message: '分享海报背景、返佣比例',
icon: 'share-icon',
leaf: '#915CF9',
background: 'linear-gradient(180deg, #D5B8FA 0%, #8F62C9 100%)',
... ... @@ -249,6 +252,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
group_id:'',
money:'',
score:'',
discount:'',
},
share: {
title: '',
... ... @@ -447,6 +451,50 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
Fast.api.close()
}
},
chooseCoupon() {
var that = this;
var multiple = true;
that.detailForm.coupon_list = that.detailForm.coupon_list ? that.detailForm.coupon_list : [];
console.log(that.detailForm.coupon_list)
let idsArr=[]
if(that.detailForm.coupon_list.length>0){
that.detailForm.coupon_list.forEach(i=>{
idsArr.push(i.id)
})
}
console.log(idsArr)
let ids=idsArr.join(',')
parent.Fast.api.open("shopro/config/couponlist?multiple=" + multiple + "&ids="+ids, "选择优惠券", {
callback: function (data) {
let couponList=[]
if (Array.isArray(data.data)) {
data.data.forEach(e => {
let obj = {
id: e.id,
image: e.image,
opt: 0,
status_text: e.status_text,
title: e.title,
type_text: e.type_text,
}
couponList.push(obj)
})
} else {
let obj = {
id: data.data.id,
image: data.data.image,
opt: 0,
status_text: data.data.status_text,
title: data.data.title,
type_text: data.data.type_text,
}
couponList.push(obj)
}
that.detailForm.coupon_list = couponList;
}
});
return false;
},
},
})
},
... ...