开发ing

.env

@@ -2,6 +2,6 @@
 ENV = 'production'
 VUE_APP_NAME = 'development'
 # 付款中心URL
-VUE_APP_PAY_CENTER_URL = 'https://spread-test.matchexpo.cn'
+VUE_APP_PAY_CENTER_URL = 'http://localhost:9522'
 # base api
 VUE_APP_BASE_API = ''

src/api/expo.js

@@ -68,7 +68,7 @@ export function getExpoInfo(key) {
  * @param {string} seo_keywords
  * @returns {*}
  */
-export function saveExpo(id,expo_name,start_date,end_date,location,organizer,contact_phone,contact_email,content,logo,images,social_links,form_template_id,page_template_id,urla,seo_title,seo_description,seo_keywords) {
+export function saveExpo(id,expo_name,start_date,end_date,location,organizer,contact_phone,contact_email,content,logo,images,social_links,form_template_id,page_template_id,urla,show_official_footer,seo_title,seo_description,seo_keywords) {
   return request({
     url: '/api/expo/info',
     method: 'post',
@@ -88,6 +88,7 @@ export function saveExpo(id,expo_name,start_date,end_date,location,organizer,con
       form_template_id,
       page_template_id,
       urla,
+      show_official_footer,
       seo_title,
       seo_description,
       seo_keywords

src/views/components/packetList.vue

@@ -51,24 +51,25 @@ export default Vue.extend({
       try {
         basePacket = this.user.app_list[0].ver_key.replace(/_STARTER|_PRO|_MONTH|_YEAR/gi, '')
         FullBasePacket = this.user.app_list[0].ver_key.replace(/_MONTH|_YEAR/gi, '')
+        console.log(basePacket, FullBasePacket)
       } catch (e) {
       }
       if (this.type === 'expoReg') {
         if (basePacket === 'EXPOREG_INVITATION') {
           if (this.cycle === 'month') {
-            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_STARTER_MONTH').price
+            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_STARTER_MONTH_PACKAGE').price
             this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_STARTER' ? '升级权益' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_STARTER_MONTH&type=2'
-            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_PRO_MONTH').price
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_STARTER_MONTH_PACKAGE&type=2'
+            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_PRO_MONTH_PACKAGE').price
             this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_PRO' ? '升级权益' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_PRO_MONTH&type=2'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_PRO_MONTH_PACKAGE&type=2'
           } else {
-            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_STARTER_YEAR').price
+            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_STARTER_YEAR_PACKAGE').price
             this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_STARTER' ? '升级权益' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_STARTER_YEAR&type=2'
-            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_PRO_YEAR').price
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_STARTER_YEAR_PACKAGE&type=2'
+            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_PRO_YEAR_PACKAGE').price
             this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_PRO' ? '升级权益' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_PRO_YEAR&type=2'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_PRO_YEAR_PACKAGE&type=2'
           }
         } else {
           if (this.cycle === 'month') {
@@ -90,35 +91,35 @@ export default Vue.extend({
       } else {
         if (basePacket === 'EXPOREG_INVITATION') {
           if (this.cycle === 'month') {
-            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_INVITATION_STARTER_MONTH').price
+            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_INVITATION_STARTER_MONTH_PACKAGE').price
             this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '立即订购' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_STARTER_MONTH&type=2'
-            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_INVITATION_PRO_MONTH').price
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_STARTER_MONTH_PACKAGE&type=1'
+            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_INVITATION_PRO_MONTH_PACKAGE').price
             this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '立即订购' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_PRO_MONTH&type=2'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_PRO_MONTH_PACKAGE&type=1'
           } else {
-            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_INVITATION_STARTER_YEAR').price
+            this.renderInfo.STARTER.price = this.getPacketByPKey('EXPOREG_INVITATION_STARTER_YEAR_PACKAGE').price
             this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '立即订购' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_STARTER_YEAR&type=2'
-            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_INVITATION_PRO_YEAR').price
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_STARTER_YEAR_PACKAGE&type=1'
+            this.renderInfo.PRO.price = this.getPacketByPKey('EXPOREG_INVITATION_PRO_YEAR_PACKAGE').price
             this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '立即订购' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_PRO_YEAR&type=2'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=&packet_key=EXPOREG_INVITATION_PRO_YEAR_PACKAGE&type=1'
           }
         } else {
           if (this.cycle === 'month') {
             this.renderInfo.STARTER.price = this.getPacktByKey('EXPOREG_INVITATION_STARTER_MONTH').price
-            this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '立即订购' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_STARTER_MONTH&packet_key=&type=1'
+            this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '升级权益' : '续费'
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_STARTER_MONTH&packet_key=&type=2'
             this.renderInfo.PRO.price = this.getPacktByKey('EXPOREG_INVITATION_PRO_MONTH').price
-            this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '立即订购' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_PRO_MONTH&packet_key=&type=1'
+            this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '升级权益' : '续费'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_PRO_MONTH&packet_key=&type=2'
           } else {
             this.renderInfo.STARTER.price = this.getPacktByKey('EXPOREG_INVITATION_STARTER_YEAR').price
-            this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '立即订购' : '续费'
-            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_STARTER_YEAR&packet_key=&type=1'
+            this.renderInfo.STARTER.button = FullBasePacket !== 'EXPOREG_INVITATION_STARTER' ? '升级权益' : '续费'
+            this.renderInfo.STARTER.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_STARTER_YEAR&packet_key=&type=2'
             this.renderInfo.PRO.price = this.getPacktByKey('EXPOREG_INVITATION_PRO_YEAR').price
-            this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '立即订购' : '续费'
-            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_PRO_YEAR&packet_key=&type=1'
+            this.renderInfo.PRO.button = FullBasePacket !== 'EXPOREG_INVITATION_PRO' ? '升级权益' : '续费'
+            this.renderInfo.PRO.url = this.payCenterUrl + '/packet/info?app_code=EXPOREG&key=EXPOREG_INVITATION_PRO_YEAR&packet_key=&type=2'
           }
         }
       }

src/views/exhibitorManage/exhibitorSetting.vue

@@ -198,7 +198,7 @@ export default Vue.extend({
         </div>
         <div v-permission="'exhibitor.copyright'" class="form-item required">
           <div class="label">表单底部显示系统信息</div>
-          <el-switch active-value="1" inactive-value="0" v-model="exhibitorSetting.show_official_footer" class="input" />
+          <el-switch :active-value="1" :inactive-value="0" v-model="exhibitorSetting.show_official_footer" class="input" />
         </div>
         <div class="form-item required">
           <div class="label">url短名称</div>

src/views/user/form.vue

@@ -294,9 +294,11 @@ export default Vue.extend({
       </div>
     </div>
     <div class="foot">
-      <div class="power-by">
+      <div v-if="from_data.show_official_footer" class="power-by">
         <a target="_blank" href="/">多果表单</a>提供技术支持 by <a target="_blank" href="https://matchexpo.cn/">MatchExpo</a>
       </div>
+      <div v-else class="power-by">
+      </div>
       <div class="share">
         <div class="text">分享至：</div>
         <div class="share-list">