Преглед изворни кода

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

1004749546@qq.com пре 4 година
родитељ
комит
11295a5ba4

+ 1 - 1
.env.preview

@@ -1,5 +1,5 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://lese.test.sxzxyj.net/gc-admin
+VUE_APP_API_BASE_URL=https://lese.test.sxzxyj.net/gc-admin
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=智享亿家后台-pro

+ 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'
   })
-}
+}

+ 6 - 6
src/views/businessManage/partnerManage/addPartnerModal.vue

@@ -9,12 +9,12 @@
       :centered="true"
       :title="titleText">
       <a-form id="components-form-demo-validate-other" ref="form" :form="form" v-bind="formItemLayout" @submit="handleSubmit">
-        <a-form-item label="供应商名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <a-form-item label="商名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
             id="addSupplierModal-name"
             :maxLength="30"
             v-decorator="['formData.name', { initialValue: formData.name,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入供应商名称(最多30个字符)!' }] }]"
-            placeholder="请输入供应商名称(最多30个字符)"
+            placeholder="请输入商名称(最多30个字符)"
             allowClear />
         </a-form-item>
         <a-form-item label="负责人名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
@@ -25,12 +25,12 @@
             placeholder="请输入联系人"
             allowClear />
         </a-form-item>
-        <a-form-item label="负责人手机号码" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <a-form-item label="负责人电话" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
             id="addSupplierModal-contactPhone"
-            :maxLength="11"
-            v-decorator="['formData.contactPhone', { initialValue: formData.contactPhone,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入手机号码!' }] }]"
-            placeholder="请输入手机号码"
+            type="number"
+            v-decorator="['formData.contactPhone', { initialValue: formData.contactPhone,getValueFromEvent: $filterEmpty, rules: [{ required: true, message: '请输入负责人电话!' }] }]"
+            placeholder="请输入负责人电话"
             allowClear />
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 6}" style="text-align: center;">

+ 16 - 31
src/views/businessManage/partnerManage/partnerManage.vue

@@ -5,21 +5,10 @@
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="48">
           <a-col :md="6" :sm="24">
-            <a-form-item label="结算时间:" :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
-              <a-range-picker
-                style="width:100%"
-                id="PaySettlementRecords-queryOrderDate"
-                :disabledDate="disabledDate"
-                v-model="queryOrderDate"
-                format="YYYY-MM-DD"
-                :placeholder="['开始时间', '结束时间']" />
-            </a-form-item>
+            <a-form-item label="商户名称"><a-input allowClear v-model.trim="queryParam.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-item label="供应商名称"><a-input allowClear v-model.trim="queryParam.name" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="负责人手机号码"><a-input allowClear v-model.trim="queryParam.contactPhone" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
+            <a-form-item label="负责人电话"><a-input allowClear v-model.trim="queryParam.contactPhone" :maxLength="30" placeholder="请输入" id="OperateJournal-name"/></a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)" id="OperateJournal-refreshTable">查询</a-button>
@@ -100,11 +89,8 @@ export default {
     return {
       queryParam: {
         name: '',
-        beginDate: '',
-        endDate: '',
         contactPhone: ''
       },
-	  queryOrderDate: undefined,
 	  openSupplierModal: false, // 默认关闭弹窗
 	  isQrCodeModal: false, //  查看小程序码   弹框展示状态
 	  qrCode: '',
@@ -138,7 +124,7 @@ export default {
 		  align: 'center'
         },
         {
-		  title: '手机号码',
+		  title: '负责人电话',
 		  width: 100,
 		  dataIndex: 'contactPhone',
 		  align: 'center',
@@ -168,13 +154,13 @@ export default {
       loadData: parameter => {
 		  const searchData = Object.assign(parameter, this.queryParam)
 		  console.log(this.queryOrderDate, 'this.queryOrderDate')
-		  if (this.queryOrderDate && this.queryOrderDate.length) {
-		    searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-		    searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-		  } else {
-		    searchData.beginDate = ''
-		    searchData.endDate = ''
-		  }
+		  // if (this.queryOrderDate && this.queryOrderDate.length) {
+		  //   searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
+		  //   searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
+		  // } else {
+		  //   searchData.beginDate = ''
+		  //   searchData.endDate = ''
+		  // }
         return getSellerList(
           searchData
         ).then(res => {
@@ -203,9 +189,9 @@ export default {
   },
   methods: {
 	  // 禁止不可选日期
-	  disabledDate (current) {
-	    return current && current > moment().endOf('day')
-	  },
+	  // disabledDate (current) {
+	  //   return current && current > moment().endOf('day')
+	  // },
     showModal () {
       this.itemId = null
 	  this.itemData = {}
@@ -224,10 +210,10 @@ export default {
     },
     // 重置
     resetForm () {
-      this.queryOrderDate = undefined
+      // this.queryOrderDate = undefined
       this.queryParam.name = ''
-	  this.queryParam.beginDate = ''
-	  this.queryParam.endDate = ''
+	  // this.queryParam.beginDate = ''
+	  // this.queryParam.endDate = ''
 	  this.queryParam.contactPhone = ''
       this.$refs.table.refresh(true)
     },
@@ -256,7 +242,6 @@ export default {
 	      this.isQrCodeModal = true
 	    } else {
 	      this.qrCode = ''
-	      this.$message.error(res.message)
 	    }
 	  })
     },

+ 1 - 1
src/views/businessManage/userManage/userModal.vue

@@ -57,7 +57,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="所属合作商" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+            <a-form-item label="所属商" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
               <a-select
                 placeholder="请选择"
                 allowClear

+ 4 - 4
src/views/equipmentManage/exchangeSetting/AddSetModal.vue

@@ -39,7 +39,7 @@
             <!-- 请输入投放重量 -->
             <a-form-item :label="item.dispName" :required="true" :label-col=" { span: 11 }" :wrapper-col=" { span: 13 }">
               <a-input-number
-                :min="1"
+                :min="0"
                 :max="999999"
                 :precision="0"
                 :disabled="item.state==0"
@@ -65,7 +65,7 @@
             <!-- 请输入可兑乐豆数 -->
             <a-form-item :label="''" :required="false" :wrapper-col="{ span: 20 }">
               <a-input-number
-                :min="1"
+                :min="0"
                 :max="999999"
                 :precision="0"
                 :disabled="item.state==0"
@@ -197,8 +197,8 @@ export default {
     // 是否兑换切换
     handleStatusChange (item, index) {
       item.state = item.state ? 0 : 1
-      this.formData['goleNum[' + index + ']'] = ''
-      this.formData['rubbishWeight[' + index + ']'] = ''
+      this.formData['goleNum[' + index + ']'] = 0
+      this.formData['rubbishWeight[' + index + ']'] = 0
       this.form.resetFields([`formData.rubbishWeight[${index}]`, `formData.goleNum[${index}]`])
     },
     // 保存提交

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

@@ -47,17 +47,17 @@
               <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <!-- <a-col :span="6">
             <a-form-item label="投递方式" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择投递方式" id="releaseRecordList-loginFlag"></v-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
         </a-row>
       </a-form>
     </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">
@@ -134,7 +134,7 @@ export default {
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
         { title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
-        { title: '投递方式', dataIndex: '', width: 200, align: 'center' },
+        // { title: '投递方式', dataIndex: '', width: 200, align: 'center' },
         { title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
         { title: '内置各箱体投放重量(g)',
 				  children: [

+ 1 - 1
src/views/shop/bannerSetting.vue

@@ -358,7 +358,7 @@ export default {
             console.log(res, 'rrrrrrrrr')
             if (res.status == 200) {
               _this.$message.success(res.message)
-              _this.$refs.table.refresh()
+              _this.$refs.table.refresh(true)
               _this.close()
             }
           })

+ 1 - 1
src/views/shop/goodsList.vue

@@ -94,7 +94,7 @@ export default {
         { title: '商品名称', dataIndex: 'name', width: 200, align: 'center' },
         { title: '商品分类', dataIndex: 'goodsTypeName', width: 200, align: 'center' },
         { title: '商品价格(乐豆)', dataIndex: 'originalGold', width: 150, align: 'center' },
-        { title: '供货商', dataIndex: 'officialPartnerSimpleName', width: 100, align: 'center' },
+        { title: '供货商简称', dataIndex: 'officialPartnerSimpleName', width: 100, align: 'center' },
         { title: '商品状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
         { title: '库存数量', dataIndex: 'inventoryQty', width: 100, align: 'center' },
         { title: '已售数量', dataIndex: 'sellQty', width: 100, align: 'center' },

+ 1 - 1
src/views/shop/orderDetail.vue

@@ -22,7 +22,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">用户手机:</p>
-          <p class="item-main"></p>
+          <p class="item-main">{{ orderDetail.customerMobile }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">收货人姓名:</p>

+ 10 - 10
src/views/shop/shopOrder.vue

@@ -16,12 +16,12 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="shopOrder-contactPhone" allowClear :maxLength="11" v-model="queryParam.contactPhone" placeholder="请输入用户手机" />
+              <a-input id="shopOrder-customerMobile" allowClear :maxLength="11" v-model="queryParam.customerMobile" placeholder="请输入用户手机" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="订单编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input id="shopOrder-orderNo" allowClear :maxLength="30" v-model="queryParam.orderNo" placeholder="请输入订单编号" />
+              <a-input id="shopOrder-orderSn" allowClear :maxLength="30" v-model="queryParam.orderSn" placeholder="请输入订单编号" />
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -30,7 +30,7 @@
                 v-model="queryParam.orderState"
                 ref="orderState"
                 id="shopOrder-status"
-                code="SETTLE_STATUS_ALL"
+                code="ORDER_STATE"
                 placeholder="请选择订单状态"
                 allowClear></v-select>
             </a-form-item>
@@ -91,8 +91,8 @@ export default {
       queryParam: {
         beginDate: null, // 开始时间
         endDate: null, // 结束时间
-        contactPhone: '', //  用户手机
-        orderNo: '', //  订单编号
+        customerMobile: '', //  用户手机
+        orderSn: '', //  订单编号
         orderState: null // 订单状态
       },
       loading: false, // 导出loading
@@ -101,7 +101,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '下单时间', dataIndex: 'orderTime', width: 200, align: 'center' },
         { title: '用户手机', dataIndex: 'userMoblie', width: 200, align: 'center' },
-        { title: '订单编号', dataIndex: 'orderNo', width: 200, align: 'center' },
+        { title: '订单编号', dataIndex: 'orderSn', width: 200, align: 'center' },
         { title: '订单状态', dataIndex: 'orderStateDictValue', width: 200, align: 'center' },
         { title: '订单总额', scopedSlots: { customRender: 'originalGold' }, width: 200, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
@@ -161,8 +161,8 @@ export default {
         moment(getDate.getToday().starttime, this.dateFormat),
         moment(getDate.getToday().endtime, this.dateFormat)
       ]
-      this.queryParam.contactPhone = ''
-      this.queryParam.orderNo = ''
+      this.queryParam.customerMobile = ''
+      this.queryParam.orderSn = ''
       this.queryParam.orderState = null
       this.$refs.table.refresh(true)
     },
@@ -171,8 +171,8 @@ export default {
       const params = {
         beginDate: this.queryParam.beginDate == null ? getDate.getToday().starttime : this.queryParam.beginDate,
         endDate: this.queryParam.endDate == null ? getDate.getToday().endtime : this.queryParam.endDate,
-        contactPhone: this.queryParam.contactPhone,
-        orderNo: this.queryParam.orderNo,
+        customerMobile: this.queryParam.customerMobile,
+        orderSn: this.queryParam.orderSn,
         orderState: this.queryParam.orderState
       }
       if (!params.beginDate && !params.endDate) {

+ 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) => {

+ 2 - 1
vue.config.js

@@ -108,7 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.104:8301/gc-admin/',
+        // target: 'http://192.168.16.104:8301/gc-admin/',
+        target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {