Przeglądaj źródła

【ID1005475】
【ID1005471】
修复bug单

zhangdan 4 lat temu
rodzic
commit
bf9bb99e72

+ 2 - 2
src/api/power-user.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: '/user/resetPwd',
+    url: `/zxyj/user/resetPwd`,
     data: params,
     method: 'POST'
   })
@@ -55,4 +55,4 @@ export const getRoleList = params => {
     data: params,
     method: 'POST'
   })
-}
+}

+ 3 - 3
src/views/releaseRecord/releaseRecordList.vue

@@ -57,7 +57,7 @@
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
+      <div class="ftext" slot="message">共<span> {{ orderTotal }} </span>单,兑换乐豆<span> {{ amountTotal }} </span>个</div>
     </a-alert>
     <s-table
       ref="table"
@@ -68,7 +68,7 @@
       bordered>
       <!-- 订单状态 -->
       <template slot="one" slot-scope="text, record">
-        <span v-if="record.rubbishType=='CLOTHING'">{{ record.rubbishWeight }}</span>
+        <span v-if="record.rubbishType=='CLOTHES'">{{ record.rubbishWeight }}</span>
         <span v-else>0</span>
       </template>
       <template slot="two" slot-scope="text, record">
@@ -84,7 +84,7 @@
         <span v-else>0</span>
       </template>
       <template slot="five" slot-scope="text, record">
-        <span v-if="record.rubbishType=='RUBBISH'">{{ record.rubbishWeight }}</span>
+        <span v-if="record.rubbishType=='HARM'">{{ record.rubbishWeight }}</span>
         <span v-else>0</span>
       </template>
       <template slot="six" slot-scope="text, record">

+ 1 - 1
src/views/userInfo/userDetails.vue

@@ -9,7 +9,7 @@
       <a-col :span="24" class="item-cont">
         <p class="item-label">手机号码:</p>
         <p class="item-main">{{ page.mobile ? page.mobile : '--' }}</p>
-        <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone" v-hasPermission="'B_user_userdetails_editPhone'"/>
+        <!-- <a-icon type="edit" title="修改手机号码" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="editPhone" v-hasPermission="'B_user_userdetails_editPhone'"/> -->
         <!-- <a style="margin-left: 100px; color: #2D8CF0;" @click="editPhone">修改手机号码</a> -->
       </a-col>
       <a-col :span="24" class="item-cont">

+ 1 - 1
src/views/userInfo/userManageList.vue

@@ -130,7 +130,7 @@ export default {
       },
       {
         title: '累计乐豆',
-        dataIndex: 'totalCarbon',
+        dataIndex: 'totalGold',
         width: 100,
         align: 'center',
         customRender: (text) => {