zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

master
Yer 2023-09-14 18:07:44 +08:00
parent 54be87efea 76fc55fdd0
commit 71f61461ce
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer/src/pages/home/orderCenter/AfterSale.vue
View File

@ -95,8 +95,8 @@
<Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option> <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="快递单号" prop="logisticsNo"> <FormItem label="物流单号" prop="logisticsNo">
<Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input> <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
</FormItem> </FormItem>
<FormItem label="发货时间" prop="mDeliverTime"> <FormItem label="发货时间" prop="mDeliverTime">
<DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime"

4
buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
View File

@ -85,8 +85,8 @@
<Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option> <Option v-for="item in companyList" :value="item.id" :key="item.id">{{ item.name }}</Option>
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="快递单号" prop="logisticsNo"> <FormItem label="物流单号" prop="logisticsNo">
<Input v-model="form.logisticsNo" placeholder="请填写快递单号"></Input> <Input v-model="form.logisticsNo" placeholder="请填写物流单号"></Input>
</FormItem> </FormItem>
<FormItem label="发货时间" prop="mDeliverTime"> <FormItem label="发货时间" prop="mDeliverTime">
<DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker> <DatePicker type="date" style="width:100%" v-model="form.mDeliverTime" @on-change="changeTime" format="yyyy-MM-dd" placeholder="选择发货时间"></DatePicker>

2
manager/src/views/order/after-order/afterSaleOrderDetail.vue
View File

@ -340,7 +340,7 @@
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>快递单号：</dt> <dt>物流单号：</dt>
<dd> <dd>
<div class="text-box">{{ afterSaleInfo.mlogisticsNo }}</div> <div class="text-box">{{ afterSaleInfo.mlogisticsNo }}</div>
</dd> </dd>

2
seller/src/views/home/home.vue
View File

@ -162,7 +162,7 @@
</div> </div>
<div> <div>
<div class="counts">{{ homeData.goodsNum || 0 }}</div> <div class="counts">{{ homeData.goodsNum || 0 }}</div>
<div>整体商品数量</div> <div>上架商品数量</div>
</div> </div>
</div> </div>

2
seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
View File

@ -326,7 +326,7 @@
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>快递单号：</dt> <dt>物流单号：</dt>
<dd> <dd>
<div nctype="ordersSn" class="text-box">{{ logisticsInfo.logisticCode }}</div> <div nctype="ordersSn" class="text-box">{{ logisticsInfo.logisticCode }}</div>
</dd> </dd>

2
seller/src/views/order/order/orderDetail.vue
View File

@ -357,7 +357,7 @@
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>快递单号：</dt> <dt>物流单号：</dt>
<dd> <dd>
<div nctype="ordersSn" class="text-box"> <div nctype="ordersSn" class="text-box">
{{ logisticsInfo.logisticCode || orderInfo.order.logisticsNo }} {{ logisticsInfo.logisticCode || orderInfo.order.logisticsNo }}

4
seller/src/views/promotion/pintuan/pintuan-edit.vue
View File

@ -35,7 +35,7 @@
</Radio> </Radio>
</RadioGroup> </RadioGroup>
<br /> <br />
<span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高</span> <span style="color: #cccccc">开启虚拟成团后，24小时人数未满的团，系统将会模拟匿名买家凑满人数，使该团成团；您只需要对已付款参团的真实买家发货；建议合理开启以提高成团率</span>
</FormItem> </FormItem>
<FormItem label="拼团规则" prop="pintuanRule"> <FormItem label="拼团规则" prop="pintuanRule">
<Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" /> <Input v-model="form.pintuanRule" type="textarea" :rows="4" clearable maxlength="255" style="width: 260px" />
@ -173,7 +173,7 @@ export default {
this.form = data; this.form = data;
// 此处将值转换为 1 true ，0 false 不然ivew radio组件会报错 // 此处将值转换为 1 true ，0 false 不然ivew radio组件会报错
this.form.fictitious ? this.$set(this.form, "fictitious", 1) : this.$set(this.form, "fictitious", 0); this.form.fictitious ? this.$set(this.form, "fictitious", 1) : this.$set(this.form, "fictitious", 0);
} }
}); });
}, },