Merge branch 'dev' of maopiao/mp-ui-pc into test

src/App.vue

@@ -16,4 +16,4 @@ export default  {
         }
     }
 }
-</script>
+</script>

src/api/common.js

@@ -12,7 +12,7 @@ export const publicFileSaveUrl = '/api/v1/mp/image/remote/upload/commpress/0'
 export const privateFileGetUrl = '/api/v1/mp/file/remote/download?name='
 
 // 云端公开可访问的BaseUrl
-export const publicFileGetUrl = process.env.NODE_ENV === "production" ? 'https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/':'https://mp-public-test-1307117429.cos.ap-shanghai.myqcloud.com/'
+export const publicFileGetUrl = process.env.NODE_ENV === "production" ? 'https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/':'https://mp-public-test-1309783959.cos.ap-shanghai.myqcloud.com/'
 
 /**
  * Put 方式上传图片

src/permission.js

@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/skip', '/jump']
+const whiteList = ['/homePage','/login', '/auth-redirect', '/bind', '/register', '/skip', '/jump']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

src/router/index.js

@@ -38,6 +38,11 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/homePage',
+    component: (resolve) => require(['@/views/homePage'], resolve),
+    hidden: true
+  },
   {
     path: '/login',
     component: (resolve) => require(['@/views/login'], resolve),

src/views/business/goods/add.vue

@@ -5,7 +5,7 @@
       <el-row :gutter="40" style="width: 500px">
         <el-col :span="23">
           <el-form-item label="商品类型:" prop="type">
-            <el-radio-group v-model="addData.type" :disabled="addData.goodsId">
+            <el-radio-group v-model="addData.type" :disabled="addData.goodsId ? true : false">
               <el-radio :label="1">实物商品</el-radio>
               <el-radio :label="2">卡密商品</el-radio>
             </el-radio-group>

src/views/business/ticket/components/AwardForm.vue

@@ -44,7 +44,7 @@
           </el-table-column>
 
           <el-table-column label="操作" align="center">
-            <template slot-scope="scope">
+            <template>
               <el-button
                 size="mini"
                 type="text"
@@ -64,7 +64,7 @@
             添加商品<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="goods">商品</el-dropdown-item>
+            <el-dropdown-item command="ticketGoods">商品</el-dropdown-item>
             <el-dropdown-item command="coupon">券</el-dropdown-item>
             <el-dropdown-item command="coupon_pkg">券包</el-dropdown-item>
 <!--            <el-dropdown-item command="coin">盲豆</el-dropdown-item>-->

src/views/business/ticket/components/GoodsAdd.vue

@@ -137,6 +137,10 @@ export default {
       type: String,
       default: '',
     },
+    ticket : {
+      type: String,
+      default: '',
+    }
   },
   data() {
     return {
@@ -161,15 +165,8 @@ export default {
     getGoodsList() {
       this.loading = true;
 
-      getGoodsList(
-        "pageNum=" +
-        this.pageParams.pageNum +
-        "&pageSize=" +
-        this.pageParams.pageSize +
-        "&",
-        {
+      let data = {
           title: this.goodsTitle,
-          exchangeShow: 2,
           status: "on",
           minValue: this.queryParams.minValue ? accMul(this.queryParams.minValue, 100) : this.queryParams.minValue,
           maxValue: this.queryParams.maxValue ? accMul(this.queryParams.maxValue, 100) : this.queryParams.maxValue,
@@ -177,8 +174,17 @@ export default {
           maxExchange:this.queryParams.maxExchange,
           minCost: this.queryParams.minCost ? accMul(this.queryParams.minCost, 100) : this.queryParams.minCost,
           maxCost: this.queryParams.maxCost ? accMul(this.queryParams.maxCost, 100) : this.queryParams.maxCost,
-        }
-      ).then((res) => {
+      }
+      if(this.ticket == "ticketGoods") {
+        data.exchangeShow = 2
+      }
+
+      getGoodsList(
+        "pageNum=" +
+        this.pageParams.pageNum +
+        "&pageSize=" +
+        this.pageParams.pageSize +
+        "&",data).then((res) => {
         this.goodsList = res.rows.map((item) => {
           return {
             ...item,

src/views/business/ticket/create.vue

@@ -176,7 +176,9 @@
     </div>
 
     <!-- 添加商品 -->
-    <goods-add :dialog-visible="goodsTableVisible" @close="close" :iconic="iconic" @confirmGoodsForm="confirmGoodsForm" @confirmGoods="confirmGoods" v-if="goodsTableVisible" />
+    <goods-add :dialog-visible="goodsTableVisible" @close="close" ticket="goods" :iconic="iconic" @confirmGoodsForm="confirmGoodsForm" @confirmGoods="confirmGoods" v-if="goodsTableVisible" />
+    <!-- 添加盲票商品 -->
+    <goods-add :dialog-visible="goodsTableVisible2" @close="close" ticket="ticketGoods" :iconic="iconic" @confirmGoodsForm="confirmGoodsForm" @confirmGoods="confirmGoods" v-if="goodsTableVisible2" />
     <!-- 添加券 -->
     <coupon-add :dialog-visible="couponTableVisible" :iconic="iconic" @close="close" @confirmCouponForm="confirmCouponForm" @confirmCoupon="confirmCoupon" v-if="couponTableVisible" />
     <!-- 添加券包 -->
@@ -326,6 +328,7 @@ export default {
       //关联商品列表
       goodsList: [],
       goodsTableVisible: false, // 添加商品弹框
+      goodsTableVisible2: false, // 添加盲票商品弹框
       couponTitle: "", // 券名称
       couponTableVisible: false, // 添加卡券弹框
       couponPkgTableVisible: false, // 添加券包弹框
@@ -545,6 +548,7 @@ export default {
     // 关闭弹框
     close() {
       this.goodsTableVisible = false;
+      this.goodsTableVisible2 = false;
       this.couponTableVisible = false;
       this.couponPkgTableVisible = false;
       this.coinTableVisible = false;
@@ -567,6 +571,9 @@ export default {
         this.couponPkgTableVisible = true;
       } else if (e == "coin") {
         this.coinTableVisible = true;
+      }else if(e == "ticketGoods") {
+        this.iconic = 'goods'
+        this.goodsTableVisible2 = true;
       }
     },
     goodsCommand(e) {
@@ -579,6 +586,9 @@ export default {
       } else if (e == "coupon_pkg") {
         this.iconic = 'couponPkgForm'
         this.couponPkgTableVisible = true;
+      }else if (e == "ticketGoods") {
+        this.iconic = 'goodsForm'
+        this.goodsTableVisible2 = true;
       }
     },
     // 确认选中商品

src/views/homePage.vue

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <div class="imgTop"></div>
+    <div class="text">
+      <div style="color: #333; font-size: 24px; margin-top: 80px;">
+        ABOUT US
+      </div>
+      <div style="color: #333; font-size: 24px; margin-top: 26px;">
+        关于我们
+      </div>
+      <div style="color: #666; font-size: 18px; margin-top: 50px;">
+        杭州盲票科技有限公司专注于供应链产品研发，通过本地化业态场景画像、设计数字娱乐互动服务工具、依托大数据分析精准运营，为线下中小微商家、线上品牌商提供一站式解决方案，随着AIoT、区块链、5G技术的发展，场景的价值越来越重要，原来中心化的平台已经走到顶了，接下来的五年、十年甚至更长时间，是以线下商业场景为核心的，盲票科技以“娱乐+社交+电商”的方式为商家赋能，多元化的场景打造，为商家获取更多新客户、留存更多老客户，并提供全面的数字化技术服务。
+      </div>
+      <div style="color: #999; font-size: 16px; margin: 60px 0 80px 0;">
+        MORE
+      </div>
+    </div>
+    <div class="imgBottom"></div>
+    <div class="bottom">
+      <div class="bottom-text">
+        <span class="icp" @click="toBeian">浙ICP备2022006422号-1</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'homePage',
+  data() {
+    return {
+
+    }
+  },
+  created() {
+    document.title = '盲票官网'
+  },
+  methods: {
+    toBeian() {
+      window.open('https://beian.miit.gov.cn/', '_blank');
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.div {
+  display: inline-block;
+}
+.text {
+  margin: 0 auto;
+  text-align: center;
+  width: 960px;
+}
+.imgTop {
+  height: 680px;
+  width: 100%;
+  background: url("../assets/images/imgtop.png") no-repeat center center;
+  // background-size: cover;
+}
+
+.imgBottom {
+  height: 480px;
+  width: 100%;
+  background: url("../assets/images/imgbottom.png") no-repeat center center;
+  // background-size: cover;
+}
+.bottom {
+  width: 100%;
+  text-align: center;
+
+  &-text {
+    padding-top: 52px;
+    height: 120px;
+    width: 100%;
+    max-width: 1920px;
+    text-align: center;
+    display: inline-block;
+    background: #e8e8e8;
+    font-size: 14px;
+    color: #666;
+    
+    .icp{
+      cursor: pointer;
+    }
+    .icp:hover {
+      color: #000;
+    }
+  }
+}
+</style>

vue.config.js

@@ -36,7 +36,9 @@ module.exports = {
       //target: `http://113.31.163.91:8090`,
       // target: `http://localhost:8080`,
       // target: `https://mp-api.51jiazhu.com`,
-      target: `https://test-mp.quanshu123.com`,
+      // target: `https://test-mp.quanshu123.com`,
+      target: `https://test-mp-adm.kaimanghe.net`,
+      // target: `http://43.143.93.199:8091`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''