许成详 6 years ago
parent
commit
09b8498928

+ 1
- 1
src/pages/system/cardAndCouponManager/couponManager/edit.vue View File

619
           caseid: this.couponInfo.CaseId
619
           caseid: this.couponInfo.CaseId
620
         }).then((res) => {
620
         }).then((res) => {
621
           this.courseList = []
621
           this.courseList = []
622
-          for (var n = 0; n < res.list.length; n++) {
622
+          for (var n = 0; n < (res.list || []).length; n++) {
623
             this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
623
             this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
624
           }
624
           }
625
           this.total = res.pagenum
625
           this.total = res.pagenum

+ 1
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue View File

76
           </div>
76
           </div>
77
         </td>
77
         </td>
78
         <td v-if="index%2 !== 0" colspan="4" class="noborder">
78
         <td v-if="index%2 !== 0" colspan="4" class="noborder">
79
-          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}{{subItem.SpecName !== '' ? '(' + subItem.SpecName + ')' : ''}}</span>
79
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}<span v-if="subItem.SpecName">({{subItem.SpecName}})</span></span>
80
         </td>
80
         </td>
81
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
81
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
82
           <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>
82
           <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>

+ 2
- 2
src/util/api.js View File

1
-const baseUrl = '/api-v2'
2
-// const baseUrl = '/api'
1
+// const baseUrl = '/api-v2'
2
+const baseUrl = '/api'
3
 const common = '/common/:org'
3
 const common = '/common/:org'
4
 const guest = '/guest/:org'
4
 const guest = '/guest/:org'
5
 
5