SpaceOfCheng
/
admin
Suivre 3
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 2 Activité
Parcourir la source

bug fix

许成详 il y a 6 ans
Parent
0329825adb
révision
f7ed596c7a
2 fichiers modifiés avec 8 ajouts et 6 suppressions
Vue unifiée Afficher les stats Diff
  1. 1
    5
      dist/index.html
  2. 7
    1
      src/pages/system/dataStatistics/goodsOrderList/index.vue

+ 1
- 5
dist/index.html Voir le fichier

1 
-<<<<<<< HEAD
2 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.36994c83a31f56978f1f734dedcbb704.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.1eab38bf1d50f932f138.js></script></body></html>
3 
-=======
4 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.7ab095c629ade1ef919410d27d9a2adc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7e921535e20f729cf046.js></script><script type=text/javascript src=./static/js/app.a65a6798c1f228acb634.js></script></body></html>
5 
->>>>>>> 498c04a2ae7cebcc8e6c9b184c216ad06951bc5a
1 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.98bb3bc99afc34819199b34e54abbf44.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.d520163d6c7bcae4ed18.js></script></body></html>

+ 7
- 1
src/pages/system/dataStatistics/goodsOrderList/index.vue Voir le fichier

81 
               <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
81 
               <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
82 
               <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
82 
               <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
83 
               <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
83 
               <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
84 
-              <span>支付方式：{{returnListItem(goodsOrderList, index).PayTypeStr}}</span>
84 
+              <span>支付方式：{{returnStr(returnListItem(goodsOrderList, index).PayType)}}</span>
85 
             </div>
85 
             </div>
86 
             <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
86 
             <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
87 
           </div>
87 
           </div>
189 
       }, {
189 
       }, {
190 
         value: '积分',
190 
         value: '积分',
191 
         id: 'points'
191 
         id: 'points'
192 
+      }, {
193 
+        value: '城币+优惠券',
194 
+        id: 'coupon-coin'
192 
       }],
195 
       }],
193 
       statusList: [{
196 
       statusList: [{
194 
         value: '',
197 
         value: '',
249 
           return '已取消'
252 
           return '已取消'
250 
       }
253 
       }
251 
     },
254 
     },
255 
+    returnStr (val) {
256 
+      return (this.paytype.filter(x => x.id === val)[0] || {}).value || '';
257 
+    },
252 
     returnListItem (target, index) {
258 
     returnListItem (target, index) {
253 
       return target[Math.ceil((index + 1) / 2) - 1]
259 
       return target[Math.ceil((index + 1) / 2) - 1]
254 
     },
260 
     },