Merge remote-tracking branch 'origin/dev' into dev

zhangmeng · 杨炀
Showing 5 changed files with 91 additions and 26 deletions
src/apiPc/common.js
src/viewsPc/components/schSearch.vue
src/viewsPc/seat/order-detail.vue
src/viewsPc/seat/utils/request.js
vite.config.js
--- a/src/apiPc/common.js
View file @bc153ac
+++ b/src/apiPc/common.js
View file @bc153ac
@@ -154,5 +154,12 @@ export function getquerySchedule2Pre(qy) {
    params: qy
  })
 }
+export function queryScheduleSingle(qy) {
+  return request({
+    url: `/league/schedule/queryScheduleSingle`,
+    method: 'get',
+    params: qy
+  })
+}
--- a/src/viewsPc/components/schSearch.vue
View file @bc153ac
+++ b/src/viewsPc/components/schSearch.vue
View file @bc153ac
@@ -10,6 +10,7 @@
      <div v-if="!type||type==''">
        <div @click="type='0'" class="rItem">{{ language==0?'按项目查询':'Query by project' }}</div>
        <div @click="type='1'" class="rItem">{{ language==0?'按团队查询':'Query by team' }}</div>
+        <div @click="type='2'" class="rItem">{{ language==0?'按姓名查询':'Query by name' }}</div>
      </div>
      <div v-if="type=='0'">
@@ -28,10 +29,13 @@
                v-for="(form, index) in list" :key="index"
                :timestamp="form.date + '  ' + form.timeStr"
            >
-              <div class="text-primary">{{ form.projectName }}</div>
+              <div class="text-primary">
+                <span v-if="language==1&&form.projectNameEn">{{ form.projectNameEn }}</span>
+                <span v-else-if="form.projectName">{{ form.projectName }}</span>
+                <span class="fr">{{form.changCi}} <i v-if="form.changCi">/ </i> {{language==0?form.lun:form.lunEn}} </span>
+              </div>
              <div>{{form.danceType}}</div>
              <div>{{form.address}}</div>
-              <div></div>
            </el-timeline-item>
          </el-timeline>
        </div>
@@ -61,20 +65,59 @@
          <el-collapse  accordion>
            <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
              <el-timeline>
-                <el-timeline-item placement="top"
+                <el-timeline-item placement="top" v-for="(form, index) in team" :key="index">
-                                  v-for="(form, index) in team" :key="index"
-                                  :timestamp="form.date + '  ' + form.timeStr"
+                    <div class="text-primary" style="position: relative;top:-15px">
-                >
+                       {{ form.date + '  ' + form.timeStr + ' / '+form.address }}
-                  <div class="text-primary">{{ form.projectName }}</div>
+                      <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
+                      <span v-else-if="form.lun"> / {{ form.lun }}</span>
+                      <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
+                    </div>
+                  <div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
+                  <div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
                  <div>{{form.danceType}}</div>
-                  <div>{{form.address}}</div>
-                  <div></div>
                </el-timeline-item>
              </el-timeline>
            </el-collapse-item>
          </el-collapse>
        </div>
      </div>
+      <div v-if="type=='2'">
+        <div class="flex mt30">
+          <el-input :placeholder="language==0?'输入选手姓名查询':'Enter the name of the player to Query'"
+                    v-model="query3" clearable
+                    @enter="personalSearch" @blur="personalSearch" @empty="personalSearch"/>
+          <el-button @click="personalSearch" class="btn-lineG" style="color: #fff">{{
+              language == 0 ? '查询' : 'Search'
+            }}
+          </el-button>
+        </div>
+        <div v-if="list.length>0" class="temell mt20">
+              <el-timeline>
+                <el-timeline-item placement="top" v-for="(team,j) in list" :key="j">
+                  <div v-for="(form, index) in team" :key="index" v-show="index==0">
+                    <div class="text-primary" style="position: relative;top:-15px">
+                      {{ form.date + '  ' + form.timeStr + ' / '+form.address }}
+                      <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
+                      <span v-else-if="form.lun"> / {{ form.lun }}</span>
+                      <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
+                    </div>
+                    <div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
+                    <div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
+                    <div>{{form.danceType}}</div>
+                  </div>
+                  <div v-for="(form, index) in team" :key="index" v-show="index>0" style="margin: 8px 0 0">
+                    {{ form.date + '  ' + form.timeStr + ' / '+form.address }}
+                    <span v-if="form.lunEn"> / {{ form.lunEn }}</span>
+                    <span v-else-if="form.lun"> / {{ form.lun }}</span>
+                    <span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
+                  </div>
+                </el-timeline-item>
+              </el-timeline>
+        </div>
+      </div>
    </div>
  </el-dialog>
 </template>
@@ -87,7 +130,7 @@ import {
  getqySchedule,
  getqySchedule2,
  getTeamBackNumber,
-  getTeamBackNumberPre
+  getTeamBackNumberPre, queryScheduleSingle
 } from "@/apiPc/common";
 import {useStorage} from "@vueuse/core/index";
@@ -100,6 +143,7 @@ const groupList = ref([])
 const teamlist = ref([])
 const query = ref('')
 const query2 = ref('')
+const query3 = ref('')
 const type = ref('')
 const showGroupList = ref(false)
 const search = () => {
@@ -143,6 +187,24 @@ const searchTeam = () => {
  })
 }
+const personalSearch = () => {
+  if (!query3.value) {
+    ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
+    return
+  }
+  loading.value = true
+  queryScheduleSingle({query: query3.value}).then(res => {
+    loading.value = false
+    if (!res.data||res.data.length==0) {
+      list.value = []
+      //提示 '未找到结果，请重新查询'
+      ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
+      return
+    }
+    list.value = res.data
+  })
+}
 const open = (param) => {
  show.value = true
  list.value = []
@@ -167,6 +229,7 @@ function showDetail(name) {
 </script>
 <style scoped lang="scss">
+.tname{font-size: 14px;font-weight: bold;position: relative;top: -8px}
 .tip{font-size: 12px;margin: 4px 0 0;display: inline-block;}
 .rItem{
  height: 130px;
--- a/src/viewsPc/seat/order-detail.vue
View file @bc153ac
+++ b/src/viewsPc/seat/order-detail.vue
View file @bc153ac
@@ -496,7 +496,7 @@ const showSJ = () => {
            </div>
          </div>
-          <div class="btn_box" v-if="detail.data?.state == 1">
+          <div class="btn_box" v-if="(detail.data?.state == 1)||(detail.data?.state == 5)">
            <el-button round class="btn-lineG w100" size="large" type="primary"
                       @click="downInvoice">
              <el-icon>
--- a/src/viewsPc/seat/utils/request.js
View file @bc153ac
+++ b/src/viewsPc/seat/utils/request.js
View file @bc153ac
@@ -85,19 +85,14 @@ export function download(url, params, filename, config) {
        })
        .then(async(res) => {
            const data = res.data
-            console.log(blobValidate(data))
+            console.log(res.headers)
            const isBlob = blobValidate(data)
            if (isBlob) {
                let hz = ''
-                if (res.headers['content-disposition'].indexOf('zip') > -1 || res.headers['content-type'].indexOf('pdf') > -1) {
+                // if (res.headers['content-disposition']?.indexOf('zip') > -1 || res.headers['content-type']?.indexOf('pdf') > -1) {
-                    // if (res.headers['content-type'].indexOf('zip') > -1) {
+                //     const index = res.headers['content-disposition'].indexOf('=')
-                    //   hz = '.zip'
+                //     hz = res.headers['content-disposition'].substr(index + 1, res.headers['content-disposition'].length)
-                    // } else if (res.headers['content-type'].indexOf('pdf') > -1) {
+                // }
-                    //   hz = '.pdf'
-                    // }
-                    const index = res.headers['content-disposition'].indexOf('=')
-                    hz = res.headers['content-disposition'].substr(index + 1, res.headers['content-disposition'].length)
-                }
                const blob = new Blob([data])
                saveAs(blob, hz ? filename = decodeURIComponent(hz) : filename)
            } else {
--- a/vite.config.js
View file @bc153ac
+++ b/vite.config.js
View file @bc153ac
@@ -76,15 +76,15 @@ export default defineConfig(({ mode, command }) => {
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
        },
        '/dev-api/ztx-webSite': {
-          // target: 'https://dance.itechtop.cn/stage-api',
+          target: 'https://wdsfwuxicenter.com/stage-api/',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
        },
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
          // target: 'http://192.168.1.131:8081/',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'http://124.70.181.90:1880/stage-api',
          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
@@ -92,8 +92,8 @@ export default defineConfig(({ mode, command }) => {
        '/ticket': {
          target: 'http://192.168.1.131:8098/',
          // target: 'http://192.168.1.131:8081/',
-          // target: 'https://jijin.wtwuxicenter.com/h5',
+          // target: 'http://124.70.181.90:1880/h5/',
-          // target: 'https://ticketh5.wdsfwuxicenter.com/h5/stage-api',
+          // target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/ticket/, '')
        }