Inicio Explorar Ayuda
Iniciar sesión
suochencheng
/
yimishijie
1
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

20190724

suochencheng hace 6 años
padre
565ae0c8f9
commit
15aaaa4f83
Se han modificado 4 ficheros con 12 adiciones y 8 borrados
Dividir vista Mostrar estadísticas de diff
  1. 8 4
      src/main/resources/properties/outsidews.properties
  2. 2 2
      src/main/vue/src/pages/ProductInfoTicket.vue
  3. 1 1
      src/main/webapp/WEB-INF/html/admin.html
  4. 1 1
      src/main/webapp/WEB-INF/html/loginAdmin.html

+ 8 - 4
src/main/resources/properties/outsidews.properties
Ver fichero 

@@ -39,8 +39,12 @@ agpay_publicKeyPath=/home/app/platform/testplat.cer
 
 agpay_notify_url=http://www.liuhuohuyu.com/agpay/notify
 
 agpay_wx_appid=wx2421b1c4370ec43b
 
 #途牛笛风
 
-tuniu_app_key=tickettest
 
-tuniu_app_secret_key=aaaaaaaa
 
-tuniu_api_url=https://doptest-api.dfyoo.com/
 
-tuniu_acctId=100012
 
+tuniu_app_key=240316_Ticket
 
+tuniu_app_secret_key=jdEXreQRwpLLNEkPgSwh
 
+tuniu_api_url=https://dop-api.dfyoo.com/
 
+tuniu_acctId=154581
 
+#tuniu_app_key=tickettest
 
+#tuniu_app_secret_key=aaaaaaaa
 
+#tuniu_api_url=https://doptest-api.dfyoo.com/
 
+#tuniu_acctId=100012

+ 2 - 2
src/main/vue/src/pages/ProductInfoTicket.vue
Ver fichero 

@@ -163,10 +163,10 @@
 
                         </el-form-item>
 
 
                         <el-form-item label="售价">
 
-                            <span style="line-height:16px;" v-html="ticketDetail.webPrice"></span>
 
+                            <span style="line-height:16px;" v-html="ticketDetail.salePrice"></span>
 
                         </el-form-item>
 
                         <el-form-item label="网络价格">
 
-                            <span style="line-height:16px;" v-html="ticketDetail.salePrice"></span>
 
+                            <span style="line-height:16px;" v-html="ticketDetail.webPrice"></span>
 
                         </el-form-item>
 
                         <el-form-item label="提示">
 
                             <span style="line-height:16px;" v-html="ticketDetail.info"></span>

+ 1 - 1
src/main/webapp/WEB-INF/html/admin.html
Ver fichero 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.206d6b0a0c36f9dca9c2b22a4c0d1711.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7ed55ccb8dff168462bd.js></script><script type=text/javascript src=/static/js/vendor.63bd2210bd34a6f1a686.js></script><script type=text/javascript src=/static/js/admin.957114a49a548d1e53d0.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.dbfb826f1aa91cf82ecfa7d78173ab41.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dfa2986c90414b872aa4.js></script><script type=text/javascript src=/static/js/vendor.63bd2210bd34a6f1a686.js></script><script type=text/javascript src=/static/js/admin.957114a49a548d1e53d0.js></script></body></html>

+ 1 - 1
src/main/webapp/WEB-INF/html/loginAdmin.html
Ver fichero 

@@ -1 +1 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.46a5161090cd0d8998f220733fc576f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7ed55ccb8dff168462bd.js></script><script type=text/javascript src=/static/js/vendor.63bd2210bd34a6f1a686.js></script><script type=text/javascript src=/static/js/loginAdmin.92bea3e4f526a6f1f18a.js></script></body></html>
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.46a5161090cd0d8998f220733fc576f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dfa2986c90414b872aa4.js></script><script type=text/javascript src=/static/js/vendor.63bd2210bd34a6f1a686.js></script><script type=text/javascript src=/static/js/loginAdmin.92bea3e4f526a6f1f18a.js></script></body></html>