Skip to content

Commit 20cba71

Browse files
committed
针对Issues中的
1.【一个订单多个商品的情况,退货时只退部分商品,退款金额是所有商品价格的总和】问题修改
1 parent 6c26e43 commit 20cba71

File tree

16 files changed

+86
-201
lines changed

16 files changed

+86
-201
lines changed

CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
//接口请求地址,如果需要不部署接口端的情况下测试uni-app,可以直接替换为官方测试接口:https://api.demo.coreshop.cn
7-
export const apiBaseUrl = 'https://api.demo.coreshop.cn';
7+
export const apiBaseUrl = 'http://localhost:2015';
88
//项目静态资源请求地址,如果使用官方的静态文件地址可以直接替换为:https://files.cdn.coreshop.cn
99
export const apiFilesUrl = 'https://files.cdn.coreshop.cn';
1010
export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址,

CoreCms.Net.Uni-App/CoreShop/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"quickapp" : {},
103103
/* 快应用特有相关 */
104104
"mp-weixin" : {
105-
"appid" : "wx11d95cdaee6058f6",
105+
"appid" : "wxa53f990d87cb6cc3",
106106
"setting" : {
107107
"urlCheck" : true,
108108
"postcss" : true,

CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
<form @submit="submit">
1313
<view class="coreshop-content-top">
1414
<view class="img-list">
15-
<checkbox-group class="cart-checkbox" v-for="(item, key) in items" :key="key" @change="checkboxChange">
15+
<checkbox-group class="cart-checkbox" v-for="(item, key) in items" :key="key" >
1616
<view class="cart-checkbox-item">
1717
<label class="uni-list-cell uni-list-cell-pd">
1818
<view class="cart-checkbox-c">
19-
<checkbox :value='item.id' :checked="item.checked" color="#FF7159" v-if="item.disabled" :disabled="item.disabled" class="checkboxNo" />
20-
<checkbox :value='item.id' :checked="item.checked" color="#FF7159" v-else />
19+
<checkbox :value='item.id' :checked="item.checked" @click="clickCheckBox(item)" color="#FF7159" v-if="item.disabled" :disabled="item.disabled" class="checkboxNo" />
20+
<checkbox :value='item.id' :checked="item.checked" @click="clickCheckBox(item)" color="#FF7159" v-else />
2121
</view>
2222
<view class="img-list-item">
2323
<u-avatar :src="item.imageUrl" mode="square" size="150" class="img-list-item-l"></u-avatar>
2424
<view class="img-list-item-r">
2525
<view class="list-goods-name">
26-
{{item.name}}
26+
{{item.name}}
2727
</view>
2828
<view class="goods-item-c u-margin-top-10 u-margin-bottom-10" v-if="item.addon">
2929
<view class="goods-buy">
@@ -260,9 +260,37 @@
260260
}
261261
});
262262
},
263+
//退货商品选择
264+
clickCheckBox: function(checkbox) {
265+
let num1=0;
266+
let num2=-1;
267+
console.log(checkbox.id)
263268
264-
//退货商品选择
265-
checkboxChange(e) {
269+
for(var i=0;i<this.itemIds.length;i++){
270+
console.log("进入循环")
271+
console.log(this.itemIds[i].id+checkbox.id)
272+
if(this.itemIds[i].id==checkbox.id){
273+
num2=i;
274+
num1=1;
275+
console.log("存在")
276+
}
277+
}
278+
if(num1==1){
279+
this.itemIds.splice(num2,1);
280+
console.log("删除")
281+
}
282+
if(num1==0){
283+
284+
this.itemIds = this.itemIds.concat({ id: checkbox.id, nums: checkbox.nums });
285+
console.log("添加")
286+
}
287+
288+
console.log(this.itemIds);
289+
},
290+
291+
292+
293+
/* checkboxChange(e) {
266294
let nums = 0;
267295
let id = 0;
268296
this.itemIds = [];
@@ -282,7 +310,7 @@
282310
}
283311
}
284312
285-
},
313+
}, */
286314
287315
// 点击输入框的事件
288316
onFocus(item, key) {
@@ -342,6 +370,7 @@
342370
343371
//提交
344372
submit(e) {
373+
345374
let _that = this;
346375
this.submitStatus = true;
347376

CoreCms.Net.Web.Admin/Doc.xml

Lines changed: 13 additions & 187 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CoreCms.Net.Web.Admin/NLog.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
1515
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
1616
-->
17-
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;">
17+
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShop;pwd=CoreShop;Database=CoreShop;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
1818
<commandText>
1919
INSERT INTO SysNLogRecords
2020
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod

0 commit comments

Comments
 (0)