Browse Source

接口对接

zhangdan 4 years ago
parent
commit
c9e59b8ee0

+ 1 - 1
src/api/bannerSetting.js

@@ -22,7 +22,7 @@ export const changeSort = (params) => {
 
 // 更改状态
 export const changeStatus = (params) => {
-  const url = `advert/enable/${params.id}/${params.flag}`
+  const url = `banner/enable/${params.id}/${params.flag}`
   return axios({
     url: url,
     data: {},

+ 64 - 14
src/api/recoveryManage.js

@@ -21,15 +21,6 @@ export const updateEnableStatus = params => {
   })
 }
 
-// // 删除用户接口
-// export const delectUserPower = params => {
-//   return axios({
-//     url: `sleler/user/delete/${params.id}`,
-//     data: {},
-//     method: 'get'
-//   })
-// }
-
 // 新增/编辑保存接口
 export const savRider = params => {
   return axios({
@@ -59,7 +50,7 @@ export const savPrice = params => {
 
 // 获取订单详情列表
 export const getOrderList = params => {
-  const url = `/dto/reserve/queryOrderReservePage/${params.pageNo}/${params.pageSize}`
+  const url = `/reserve/queryOrderReservePage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -70,7 +61,7 @@ export const getOrderList = params => {
 }
 // 订单总计
 export const getOrderTotal = (params) => {
-  const url = `/dto/reserve/groupOrderReserve`
+  const url = `/reserve/groupOrderReserve`
   return axios({
     url: url,
     data: params,
@@ -80,7 +71,7 @@ export const getOrderTotal = (params) => {
 
 // 获取订单统计列表
 export const getOrderTotalList = params => {
-  const url = `/dto/reserve/orderReserveGroupByUserExtPage/${params.pageNo}/${params.pageSize}`
+  const url = `/reserve/orderReserveGroupByUserExtPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -91,7 +82,7 @@ export const getOrderTotalList = params => {
 }
 // 订单总计
 export const getOrderTotalNum = (params) => {
-  const url = `/dto/reserve/groupExtPage`
+  const url = `/reserve/groupExtPage`
   return axios({
     url: url,
     data: params,
@@ -100,10 +91,69 @@ export const getOrderTotalNum = (params) => {
 }
 // 订单详情
 export const orderDetails = (params) => {
-  const url = `dto/reserve/orderReserveInfo`
+  const url = `/reserve/orderReserveInfo`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// banner图列表
+export const getbanerList = params => {
+  const url = `/banner/query/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST'
+  })
+}
+
+// 改变权限状态接口
+export const updateBannerStatus = params => {
+  return axios({
+    url: `/banner/enable/${params.id}/${params.flag}`,
+    data: {},
+    method: 'get'
+  })
+}
+
+// 删除用户接口
+export const delecBanner = params => {
+  return axios({
+    url: `/banner/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+
+// 新增/编辑保存接口
+export const savBanner = params => {
+  return axios({
+    url: '/banner/save',
+    data: params,
+    method: 'POST'
+  })
+}
+
+// banner详情
+export const bannerDetails = (params) => {
+  const url = `/banner/getById/${params.id}`
   return axios({
     url: url,
     data: params,
+    method: 'get'
+  })
+}
+
+// 上移下移
+export const changeSort = (params) => {
+  const url = `/banner/swapBannerSort/${params.id}/${params.sortId}`
+  return axios({
+    url: url,
+    data: {},
     method: 'post'
   })
 }

+ 23 - 26
src/views/recoveryManage/bannerSet.vue

@@ -38,7 +38,6 @@
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="eye"
-          v-if="$hasPermissions('B_adBanner_view')"
           id="bannerSetting-handleView"
           title="查看"
           class="actionBtn icon-green"
@@ -46,15 +45,15 @@
         <a-icon
           type="edit"
           id="bannerSetting-handleEdit"
-          v-if="record.state == '0'&&$hasPermissions('B_adBanner_edit')"
+          v-if="record.status == 0"
           title="编辑"
           class="actionBtn icon-blues"
           @click="handleEdit(record, 0)" />
         <a-icon
           type="delete"
           id="bannerSetting-delect"
-          v-if="record.state == '0'&&$hasPermissions('B_adBanner_del')"
           title="删除"
+           v-if="record.status == 0"
           class="actionBtn icon-red"
           @click="delect(record)" />
       </span>
@@ -63,8 +62,7 @@
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="bannerSetting-changeFlagHandle"
-          v-if="$hasPermissions('B_adBanner_enable')"
-          v-model="record.state == 1 ? true : false"
+          v-model="record.status == 1 ? true : false"
           @change="changeFlagHandle(text, record)"
         />
       </span>
@@ -100,7 +98,7 @@
           <a-radio-group
             :disabled="disabled"
             id="bannerSetting-status"
-            v-decorator="['formData.state', { initialValue: formData.state, rules: [{ required: true, message: '请选择状态!' }] }]"
+            v-decorator="['formData.status', { initialValue: formData.status, rules: [{ required: true, message: '请选择状态!' }] }]"
           >
             <a-radio value="1">启用</a-radio>
             <a-radio value="0">禁用</a-radio>
@@ -111,15 +109,15 @@
             <Upload
               class="upload"
               id="bannerSetting-photoPath"
-              v-decorator="[ 'formData.image', { initialValue: formData.image, rules: [{ required: true, message: '请上传轮播图!' }] } ]"
+              v-decorator="[ 'formData.url', { initialValue: formData.url, rules: [{ required: true, message: '请上传轮播图!' }] } ]"
               ref="bannerImage"
               :fileSize="0.25"
               :disabled="disabled"
               @change="getbannerImage"
               listType="picture-card" ></Upload>
-            <span class="upload-desc">请上传750*250尺寸的图片,大小不超过0.25MB,png、jpg、jpeg格式。</span>
+            <span class="upload-desc">请上传375*100px尺寸的图片。</span>
           </div>
-          <img v-else :src="formData.image" style="max-width:400px ;height: auto;" />
+          <img v-else :src="formData.url" style="max-width:400px ;height: auto;" />
         </a-form-item>
         <a-form-item label="备注" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
@@ -143,7 +141,7 @@
 
 <script>
 import { Upload, STable, VSelect } from '@/components'
-import { getadvertSettingList, changeStatus, changeSort, deleteItem, saveItem } from '@/api/bannerSetting.js'
+import { getbanerList, updateBannerStatus, delecBanner, savBanner,changeSort } from '@/api/recoveryManage.js'
 
 export default {
   components: {
@@ -171,7 +169,7 @@ export default {
         {
           title: '状态',
           width: 100,
-          dataIndex: 'state',
+          dataIndex: 'status',
           align: 'center',
           scopedSlots: {
             customRender: 'status'
@@ -197,7 +195,8 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getadvertSettingList(parameter).then(res => {
+        return getbanerList(parameter).then(res => {
+          console.log(res, '------------banner')
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]
@@ -224,9 +223,8 @@ export default {
       },
       formData: {
         title: '', // 标题
-        state: '', // 状态
-        type: 'banner', // 广告图类型
-        image: '', // banner地址
+        status: '', // 状态
+        url: '', // banner地址
         createDate: '', // 创建时间
         remarks: '' // 备注
       },
@@ -264,9 +262,9 @@ export default {
       const _this = this
       this.form.validateFields((err, values) => {
         if (!err) {
-          const formData = Object.assign({}, this.formData, values.formData)
+          const formData = Object.assign({}, this.formData, values.formData,{appType:'cust'})
           console.log(formData)
-          saveItem(formData).then(res => {
+          savBanner(formData).then(res => {
             console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message)
@@ -280,8 +278,8 @@ export default {
     close () {
       this.visible = false
       this.formData.title = ''
-      this.formData.state = ''
-      this.formData.image = ''
+      this.formData.status = ''
+      this.formData.url = ''
       this.formData.remarks = '' // 备注
       this.title = '新增'
       if (this.$refs.bannerImage) {
@@ -293,8 +291,8 @@ export default {
     assignment (row) {
       this.formData.id = row.id
       this.formData.title = row.title
-      this.formData.image = row.image
-      this.formData.state = row.state
+      this.formData.url = row.url
+      this.formData.status = row.status
       this.formData.remarks = row.remarks
       this.formData.createDate = row.createDate
       this.jumpTypeChange(this.formData.jumpType)
@@ -309,11 +307,10 @@ export default {
         this.title = '编辑'
         this.hideRequiredMark = false
         setTimeout(() => {
-          _this.$refs.bannerImage.setFileList(this.formData.image)
+          _this.$refs.bannerImage.setFileList(this.formData.url)
         }, 500)
       }
       this.assignment(row)
-      this.disabled = type == 1
       this.visible = true
     },
     // 删除
@@ -326,7 +323,7 @@ export default {
         okText: '确定',
         cancelText: '取消',
         onOk () {
-          deleteItem({
+          delecBanner({
             id: row.id
           }).then(res => {
             if (res.status == 200) {
@@ -341,9 +338,9 @@ export default {
     changeFlagHandle (text, record) {
       const _data = {
         id: record.id,
-        flag: record.state == 1 ? '0' : '1'
+        flag: record.status == 1 ? '0' : '1'
       }
-      changeStatus(_data).then(res => {
+      updateBannerStatus(_data).then(res => {
         if (res.status == '200') {
           this.$message.success(res.message)
           this.$refs.table.refresh()

+ 10 - 1
src/views/recoveryManage/recoveryPriceSet.vue

@@ -62,7 +62,7 @@ export default {
       type: '',
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 60, align: 'center', scopedSlots: { customRender: 'no' } },
+        { title: '序号', dataIndex: 'no', width: 60, align: 'center'},
         { title: '回收类型', dataIndex: 'fatherName', width: 100, align: 'center' },
         { title: '回收名称', dataIndex: 'name', width: 100, align: 'center' },
         { title: '回收价格(元/kg)', dataIndex: 'advicePrice', width: 100, align: 'center', scopedSlots: { customRender: 'advicePrice' } },
@@ -81,6 +81,9 @@ export default {
       gePriceList({ adviceType: key }).then(res => {
         if (res.status == 200) {
           this.loadData = res.data
+          this.loadData.forEach((item,index)=>{
+             item.no=index+1
+          })
         }
       })
       // this.save()
@@ -90,6 +93,9 @@ export default {
       gePriceList({ adviceType: '1' }).then(res => {
         if (res.status == 200) {
           this.loadData = res.data
+          this.loadData.forEach((item,index)=>{
+             item.no=index+1
+          })
         }
       })
     },
@@ -111,6 +117,9 @@ export default {
           gePriceList({ adviceType: this.type ? this.type : 1 }).then(res => {
             if (res.status == 200) {
               this.loadData = res.data
+              // this.loadData.forEach((item,index)=>{
+              //    item.no=index+1
+              // })
             }
           })
         } else {

+ 1 - 1
src/views/recoveryManage/riderModal.vue

@@ -168,7 +168,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              // this.$message.error(res.message)
+              this.$message.error(res.message)
             }
           })
         }

+ 4 - 12
src/views/recoveryManage/riderOrderModal.vue

@@ -100,16 +100,12 @@
         :scroll="{ y: 450 }"
         bordered
       >
-        <template slot="no">
-        <!-- <span>{{tableData[i]}}</span> -->
-        </template>
       </a-table>
     </a-modal>
   </div>
 </template>
 
 <script>
-// import {  VSelect } from '@/components'
 import { orderDetails } from '@/api/recoveryManage.js'
 export default {
   name: 'RiderOrderModal',
@@ -131,7 +127,7 @@ export default {
       isShow: this.visible,
       tableData: [], // 列表数据
       pageInfo: {},
-      columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center', scopedSlots: { customRender: 'no' } },
+      columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '回收类别', dataIndex: 'RUBBISH_TYPE', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '回收名称', dataIndex: 'RUBBISH_TYPE_ITEM', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '回收价格', dataIndex: 'RUBBISH_PRICE', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
@@ -142,17 +138,13 @@ export default {
   methods: {
     // 详情数据
     getPageData () {
-      // const params = {}
-      // if (this.itemOrderNo) {
-      //   // params.OrderReserveEntity = {
-      //   //   orderReserveNo: this.itemOrderNo
-      //   // }
-      // }
       orderDetails({ orderReserveNo: this.itemOrderNo }).then(res => {
         if (res.status == 200) {
           this.pageInfo = res.data
           this.tableData = res.data.orderReserveItemEntityList || []
-          console.log(res, '------------详情数据')
+          this.tableData.forEach((item,index)=>{
+             item.no=index+1
+          })
         }
       })
     },

+ 2 - 1
src/views/recoveryManage/riderRecoveryTotal.vue

@@ -148,7 +148,8 @@ export default {
       getOrderTotalNum(params).then(res => {
         if (res.status == 200) {
           if (res.data != 0 || null) {
-            // this.weightTotal = (res.data.cleanWeight / 1000).toFixed(3) / 1
+            this.weightTotal = (res.data.totalAllWeight / 1000).toFixed(3) / 1 || 0
+            this.moneyTotal=res.data.originalAllAmount || 0
           }
         } else {
           this.weightTotal = 0