Bladeren bron

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

lilei 4 jaren geleden
bovenliggende
commit
ba2d2ffb5f

+ 6 - 6
src/views/businessManage/userManage/userManage.vue

@@ -139,25 +139,25 @@ export default {
       {
         title: '创建时间',
         dataIndex: 'createDate',
-        width: '120',
+        width: 150,
         align: 'center'
       },
       {
         title: '用户名称',
         dataIndex: 'name',
-        width: '100',
+        width: 100,
         align: 'center'
       },
       {
         title: '手机号码',
         dataIndex: 'phone',
-        width: '100',
+        width: 100,
         align: 'center'
       },
 	  {
 	    title: '合作商',
 	    dataIndex: 'org.name',
-	    width: '100',
+	    width: 100,
 	    align: 'center'
 	  },
 	  // {
@@ -176,7 +176,7 @@ export default {
       // },
       {
         title: '状态',
-        width: '100',
+        width: 100,
         align: 'center',
         scopedSlots: {
           customRender: 'status'
@@ -184,7 +184,7 @@ export default {
       },
       {
         title: '操作',
-        width: '100',
+        width: 100,
         align: 'center',
         scopedSlots: {
           customRender: 'action'

+ 2 - 1
src/views/shopSetting/addGoodsClassModal.vue

@@ -23,6 +23,7 @@
             class="inpNumber"
             :min="0"
             :max="999999"
+            :precision="0"
             v-decorator="[ 'formData.popularizeGoodsLimit', { initialValue: formData.popularizeGoodsLimit, rules: [{ required: true, message: '请输入商城主页显示数量(0~999999)' }] } ]"
             placeholder="请输入商城主页显示数量(0~999999)"
             allowClear />
@@ -33,7 +34,7 @@
             class="inpNumber"
             :min="0"
             :max="999999"
-            :precision="2"
+            :precision="0"
             v-decorator="[ 'formData.goldLimit', { initialValue: formData.goldLimit, rules: [{ required: true, message: '请输入订单起购金额(0~999999)' }] } ]"
             placeholder="请输入订单起购金额(0~999999)"
             allowClear />

+ 9 - 8
src/views/userInfo/LdDetails.vue

@@ -49,13 +49,8 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 类型 -->
-      <span slot="changeType" slot-scope="text, record">{{ $refs.changeType.getNameByCode(record.changeType) }}</span>
-      <!-- 原因 -->
-      <span slot="operateType" slot-scope="text, record">{{ $refs.operateType.getNameByCode(record.operateType) }}</span>
     </s-table>
   </a-card>
-
 </template>
 
 <script>
@@ -84,10 +79,16 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '下单时间', dataIndex: 'createDate', width: 200, align: 'center' },
-        { title: '类型', dataIndex: 'changeType', scopedSlots: { customRender: 'changeType' }, width: 200, align: 'center' },
-        { title: '原因', dataIndex: 'operateType', scopedSlots: { customRender: 'operateType' }, width: 200, align: 'center' },
+        { title: '类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
+        { title: '原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
         { title: '乐豆变动', dataIndex: 'changeNum', width: 200, align: 'center' },
-        { title: '详情', dataIndex: 'remarks', width: 200, align: 'center' }
+        { title: '详情',
+          dataIndex: 'remarks',
+          width: 200,
+          align: 'center',
+          customRender: (text) => {
+            return text || '--'
+          } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 12 - 8
src/views/userInfo/userDetails.vue

@@ -1,9 +1,10 @@
 <template>
   <a-card :bordered="false" class="orderDetail-goods-info">
     <a-row :gutter="48">
-      <a-col :span="24" class="item-cont">
-        <p class="item-label">头像:</p>
-        <p class="item-main"><img src="../../assets/avatar2.jpg" alt="" class="img"></p>
+      <a-col :span="24" class="item-cont item-img">
+        <p class="item-label" style="line-height: 37px;">头像:</p>
+		<img v-if="page.headImageUrl" :src="page.headImageUrl" alt="" class="img">
+        <p class="item-main" v-else>--</p>
       </a-col>
       <a-col :span="24" class="item-cont">
         <p class="item-label">手机号码:</p>
@@ -12,7 +13,7 @@
       </a-col>
       <a-col :span="24" class="item-cont">
         <p class="item-label">收货地址:</p>
-        <p class="item-main">陕西省西安市未央区阿克苏接电话高科技大厦</p>
+        <p class="item-main">{{page.receiveAddressList ? page.receiveAddressList[0].receiveAddress : '--'}}</p>
       </a-col>
       <a-col :span="24" class="item-cont">
         <p class="item-label">乐豆余额:</p>
@@ -115,8 +116,11 @@ export default {
 		display: flex;
 		margin: 10px 10px 10px 50px;
 	}
-	.img{
-		width:50px;
-		border-radius:50% ;
-	}
+	
+		.img{
+			width:50px;
+			border-radius:50% ;
+		}
+	
+	
 </style>