高铁站行李寄存系统
上一版本: 23a45956 | 补丁 | 提交 | 忽略空白
doum
13 小时以前 e51ccb9bfc6712bd405ffd69d7365b542ef350f4 
支付宝支付ddd
已添加1个文件
已修改6个文件
123 ■■■■■ 文件已修改
admin/admin/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/shopInfo.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaPrinterEditWindow.vue 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaShopInfoWindow.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/storeList.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/shop/pages/order-details/order-details.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
small-program/utils/http.api.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 admin/admin/index.html


@@ -1 +1 @@


<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>高铁站行李寄存管理系统</title><link href="static/css/app.48a9fe75.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.b9055ec1.js" rel="preload" as="script"><link href="static/js/chunk-vendors.ff1e50a7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.48a9fe75.css" rel="stylesheet"></head><body><div id="app"></div><script src="static/js/chunk-vendors.ff1e50a7.js"></script><script src="static/js/app.b9055ec1.js"></script></body></html>


<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>高铁站行李寄存管理系统</title><link href="static/css/app.973c4f23.css" rel="preload" as="style"><link href="static/css/chunk-vendors.d9e68312.css" rel="preload" as="style"><link href="static/js/app.c8723425.js" rel="preload" as="script"><link href="static/js/chunk-vendors.ff1e50a7.js" rel="preload" as="script"><link href="static/css/chunk-vendors.d9e68312.css" rel="stylesheet"><link href="static/css/app.973c4f23.css" rel="stylesheet"></head><body><div id="app"></div><script src="static/js/chunk-vendors.ff1e50a7.js"></script><script src="static/js/app.c8723425.js"></script></body></html>




 admin/src/api/business/shopInfo.js


@@ -17,6 +17,9 @@


export function updateById (data) {


  return request.post('/business/shopInfo/updateShop', data)


}


export function maintainPrinter (data) {


  return request.post('/business/shopInfo/maintainPrinter', data)


}




export function deleteById (id) {


  return request.get(`/business/shopInfo/delete/${id}`)




 admin/src/components/business/OperaPrinterEditWindow.vue


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,74 @@


<template>


  <GlobalWindow


    :title="title"


    :visible.sync="visible"


    :confirm-working="isWorking"


    @confirm="confirm"


  >


    <div class="tip-warn" >


      <i class="el-icon-warning"></i>


      æ­£åœ¨ä¸ºé—¨åº—【<span style="color: red;font-weight: 600;">{{form.name}}</span>】设置打印机信息</div>


    <el-form :model="form" ref="form" :rules="rules">


      <el-form-item label="打印机序列号" prop="printerSn">


        <el-input v-model="form.printerSn" placeholder="请输入排序码" v-trim/>


      </el-form-item>


    </el-form>


  </GlobalWindow>


</template>




<script>


import BaseOpera from '@/components/base/BaseOpera'


import GlobalWindow from '@/components/common/GlobalWindow'


import {maintainPrinter} from '@/api/business/shopInfo'


export default {


  name: 'OperaCategoryWindow',


  extends: BaseOpera,


  components: { GlobalWindow },


  data () {


    return {


      isUploading: false,


      // è¡¨å•æ•°æ®


      form: {


        id: null,


        name: null,


        printerSn: ''


      },


      // éªŒè¯è§„则


      rules: {


        printerSn: [{ required: true, message: '请输入打印机序列号' }]


      }


    }


  },


  methods: {


    open (title, target) {


      console.log("=======================",target)


      this.title = title


      this.visible = true


      this.form = target




      console.log("=======================",  this.form)


    },


    __confirmEdit () {


      this.$refs.form.validate((valid) => {


        if (!valid) {


          return


        }


        // è°ƒç”¨æ›´æ–°æŽ¥å£


        this.isWorking = true


        maintainPrinter(this.form)


          .then(() => {


            this.visible = false


            this.$tip.apiSuccess('修改成功')


            this.$emit('success')


          })


          .catch(e => {


            this.$tip.apiFailed(e)


          })


          .finally(() => {


            this.isWorking = false


          })


      })


    }


  }


}


</script>




 admin/src/components/business/OperaShopInfoWindow.vue


@@ -290,9 +290,10 @@


  components: { GlobalWindow, Pagination,OperaOrderDetail },


  data () {


    return {


      title: '',


      activeTab: 'performance',


      storeInfo: {},


      visible:false,


      visible: false,


      searchForm: {


        orderNo: '',


        goodsInfo: '',




 admin/src/views/business/storeList.vue


@@ -19,6 +19,9 @@


      <el-form-item label="联系电话" prop="linkPhone">


        <el-input v-model="searchForm.linkPhone" clearable placeholder="请输入联系电话" @keypress.enter.native="search"></el-input>


      </el-form-item>


      <el-form-item label="联系电话" prop="linkPhone">


        <el-input v-model="searchForm.linkPhone" clearable placeholder="请输入联系电话" @keypress.enter.native="search"></el-input>


      </el-form-item>


      <el-form-item label="注册时间" prop="createTimeStr">


        <el-date-picker type="daterange" v-model="searchForm.createTimeStr" clearable value-format="yyyy-MM-dd"


                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleDateChange" />


@@ -56,6 +59,12 @@


        <el-table-column prop="address" label="门店地址" min-width="200px"></el-table-column>


        <el-table-column prop="linkName" label="联系人" min-width="100px"></el-table-column>


        <el-table-column prop="linkPhone" label="联系电话" min-width="120px"></el-table-column>


        <el-table-column prop="printerSn" label="打印机序列号" min-width="160px">


          <template slot-scope="{row}">


            <span class="greenstate"  style="cursor: pointer"   @click="$refs.operaPrinterEditWindow.open('门店打印机设置', row)" v-if="row.printerSn"  >{{ row.printerSn }}</span>


            <span class="redstate" style="cursor: pointer" v-else  @click="$refs.operaPrinterEditWindow.open('门店打印机设置', row)"> æœªè®¾ç½®</span>


          </template>


        </el-table-column>


        <el-table-column prop="createTime" label="注册日期" min-width="160px"></el-table-column>


        <el-table-column label="账号状态" min-width="100px">


          <template slot-scope="{row}">


@@ -64,9 +73,10 @@


            </el-switch>


          </template>


        </el-table-column>


        <el-table-column label="操作" min-width="150" fixed="right">


        <el-table-column label="操作" min-width="180" fixed="right">


          <template slot-scope="{row}">


            <el-button type="text" @click="handleEdit(row)">编辑</el-button>


            <el-button type="text" @click="$refs.operaPrinterEditWindow.open('门店打印机设置', row)">打印机设置</el-button>


            <el-button type="text" @click="handleResetPwd(row)">重置密码</el-button>


          </template>


        </el-table-column>


@@ -81,6 +91,7 @@


    <!-- é—¨åº—详情 -->


    <OperaShopInfoWindow ref="operaShopInfoWindow" />


    <!-- ç¼–辑门店 -->


    <OperaPrinterEditWindow ref="operaPrinterEditWindow" @success="search" />


    <OperaShopEditWindow ref="operaShopEditWindow" @success="search" />


  </TableLayout>


</template>


@@ -91,11 +102,12 @@


import Pagination from '@/components/common/Pagination'


import OperaShopInfoWindow from '@/components/business/OperaShopInfoWindow'


import OperaShopEditWindow from '@/components/business/OperaShopEditWindow'


import OperaPrinterEditWindow from '@/components/business/OperaPrinterEditWindow'


import { changeStatus, resetPassword } from '@/api/business/shopInfo'


export default {


  name: 'StoreList',


  extends: BaseTable,


  components: { TableLayout, Pagination, OperaShopInfoWindow, OperaShopEditWindow },


  components: { TableLayout, Pagination, OperaShopInfoWindow, OperaShopEditWindow,OperaPrinterEditWindow },


  data () {


    return {


      searchForm: {




 small-program/shop/pages/order-details/order-details.vue


@@ -234,6 +234,7 @@


                <view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 || info.status === 5" >联系客户</view>


                <view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 || info.status === 3)">联系骑手</view>


                <view class="btn you"  v-if="info.status ===1  || info.status ===4 "   @click="hexiaoOrder(info)" >收件核销</view>


                <view class="btn you"  v-if="info.status ==2 || info.status ===3  || info.status ===4  "   @click="printerOrder(info)" >打印标签</view>


                <view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1)" @click="hexiaoOrder(info)" >确认到店</view>


                <view class="btn you" v-if="info.status ===5 && (info.overdueStatus == 4 || info.overdueStatus == 2)" @click="hexiaoOrder(info)" >取件核销</view>


            </view>


@@ -266,6 +267,7 @@


        },


        data() {


            return {


                loading:false,


                id:null,


                qrcodeImage:null,


                showCancel:false,


@@ -307,6 +309,27 @@


            cancelOrder(item){


                this.showCancel = !this.showCancel


            }, 


            async printerOrder(){


                if(this.loading){


                    return


                }


                this.loading =true


                try{


                    var that =this


                     that.$u.api.printOrderLabel({ orderId: this.id }).then(res=>{


                         if (res.code === 200 ) {


                             uni.showToast({


                                 title:'发起打印请求成功',


                                icon:'none'


                             })


                         } 


                         that.loading =false


                     })


                }catch(e){


                    this.loading =false


                } 


				


            },


            async cancelOrderDo(){


                var that =this


                let res = await that.$u.api.cancelOrder({ orderId: this.id });




 small-program/utils/http.api.js


@@ -60,7 +60,9 @@


    let getActiveOrderTip= (params = {}) => vm.$u.http.get('web/config/getActiveOrderTip',{ params });    // é¦–页进行中订单提示


    let maintainInfo= (data = {}) => vm.$u.http.post('web/shopInfo/maintainInfo',data);    // æŸ¥è¯¢é—¨åº—维护信息


    let maintainShopInfo= (data = {}) => vm.$u.http.post('web/shopInfo/maintain',data);    // æŸ¥è¯¢é—¨åº—维护信息


    let printOrderLabel = (params = {}) => vm.$u.http.get('web/shopInfo/printOrderLabel/'+params.orderId,{ params });    //门店订单打印


    vm.$u.api = {


        printOrderLabel,


        getActiveOrderTip,


        logOutShop,


        maintainShopInfo,