Domů Procházet Nápověda
Přihlásit se
qmx
/
jy
14
0
Rozštěpit 0
Soubory Úkoly 2 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

xuzhiheng před 5 roky
rodič
f23be36b17 c9712cbd3e
revize
d58ef52b11
8 změnil soubory, kde provedl 33 přidání a 5 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 4 2
      src/jfw/modules/app/src/app/front/myorder.go
  2. 4 1
      src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/order_detail.css
  3. 5 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_detail.css
  4. binární
      src/jfw/modules/app/src/web/staticres/jyapp/res/dataexport/20190926105536_105530500413_YUDpw.xlsx
  5. binární
      src/jfw/modules/app/src/web/staticres/jyapp/res/dataexport/20190927155823_155814021519_FnKsP.xlsx
  6. 0 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
  7. 5 1
      src/web/staticres/wx_dataExport/css/order_detail.css
  8. 15 0
      src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

+ 4 - 2
src/jfw/modules/app/src/app/front/myorder.go
Zobrazit soubor 

@@ -334,20 +334,22 @@ func (m *MyOrder) ToOrderDetail() error {
 
 			// 0微信支付 1支付宝支付
 
 			if util.ObjToString(orderDetail["pay_way"]) == "wx_pc" || util.ObjToString(orderDetail["pay_way"]) == "wx_js" || util.ObjToString(orderDetail["pay_way"]) == "wx_app" {
 
 				table = "weixin_pay"
 
-				orderDetail["pay_way"] = 0
 
+				//orderDetail["pay_way"] = 0
 
 			} else if util.ObjToString(orderDetail["pay_way"]) == "ali_pc" || util.ObjToString(orderDetail["pay_way"]) == "ali_app" {
 
-				orderDetail["pay_way"] = 1
 
+				//orderDetail["pay_way"] = 1
 
 				table = "ali_pay"
 
 			} else {
 
 				return ""
 
 			}
 
 			wxPayMap := map[string]interface{}{}
 
 			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
 
+			log.Println("-------")
 
 			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
 
 			return util.ObjToString((*wxpay)["transaction_id"])
 
 		}()
 
 	}
 
 	m.T["o"] = orderDetail
 
+	log.Println(orderDetail)
 
 	error := m.Render("/dataExport/dataExport_toOrderDetail.html", &m.T)
 
 	log.Println(error)
 
 	return nil

+ 4 - 1
src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/order_detail.css
Zobrazit soubor 

@@ -64,7 +64,6 @@
 
   -webkit-box-pack: start;
 
   -ms-flex-pack: start;
 
   justify-content: flex-start;
 
-  line-height:0.384rem;
 
 }
 
 #order_detail .main .lists .card .card-content .item-list .item-list-parents li {
 
   margin-right: 0.1rem;
 
@@ -77,6 +76,10 @@
 
   border-radius: 0.06rem;
 
   font-size: .28rem;
 
   color: #2cb7ca;
 
+/*padding-top:0.03rem;*/
 
+	display: inline-block;
 
+	height: 1.60em;
 
+	    line-height: 1.6em;
 
 }
 
 #order_detail .main .lists .card .unit p {
 
   display: -webkit-box;

+ 5 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/order_detail.css
Zobrazit soubor 

@@ -68,6 +68,9 @@
 
   margin-right: 0.1rem;
 
   font-size: .28rem;
 
   color: #686868;
 
+  font-weight: 500;
 
+	display: block;
 
+	white-space: nowrap;
 
 }
 
 #order_detail .main .lists .card .invoicing {
 
   padding: 0 .12rem;
 
@@ -76,6 +79,8 @@
 
   font-size: .28rem;
 
   color: #2cb7ca;
 
 /*padding-top:0.03rem;*/
 
+	display: inline-block;
 
+	height: 1.60em;
 
 }
 
 #order_detail .main .lists .card .unit p {
 
   display: -webkit-box;

binární
src/jfw/modules/app/src/web/staticres/jyapp/res/dataexport/20190926105536_105530500413_YUDpw.xlsx
Zobrazit soubor


binární
src/jfw/modules/app/src/web/staticres/jyapp/res/dataexport/20190927155823_155814021519_FnKsP.xlsx
Zobrazit soubor


+ 0 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html
Zobrazit soubor 

@@ -259,7 +259,6 @@
 
 							//排除词
 
 		                    var exclude = keywordObj["exclude"];
 
 		                    var excludeStr =exclude+"";
 
-							console.log(excludeStr)
 
 							if(excludeStr.match(reg)){
 
 								excludeStr=excludeStr.replace(/,/g," ");
 
 							}

+ 5 - 1
src/web/staticres/wx_dataExport/css/order_detail.css
Zobrazit soubor 

@@ -64,12 +64,14 @@
 
   -webkit-box-pack: start;
 
   -ms-flex-pack: start;
 
   justify-content: flex-start;
 
-  line-height:0.384rem;
 
 }
 
 #order_detail .main .lists .card .card-content .item-list .item-list-parents li {
 
   margin-right: 0.1rem;
 
   font-size: .28rem;
 
   color: #686868;
 
+  font-weight: 500;
 
+	display: block;
 
+	white-space: nowrap;
 
 }
 
 #order_detail .main .lists .card .invoicing {
 
   padding: 0 .12rem;
 
@@ -78,6 +80,8 @@
 
   font-size: .28rem;
 
   color: #2cb7ca;
 
 /*padding-top:0.03rem;*/
 
+	display: inline-block;
 
+	height: 1.60em;
 
 }
 
 #order_detail .main .lists .card .unit p {
 
   display: -webkit-box;

+ 15 - 0
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html
Zobrazit soubor 

@@ -15,6 +15,21 @@
 
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/order_detail.css?v={{Msg "seo" "version"}}1">
 
 	</head>
 
 	<body>
 
+		<style>
 
+			html, body {
 
+			    max-width: 750px;
 
+			    -webkit-text-size-adjust: 100%;
 
+			    margin: 0 auto;
 
+			    height: 100%;
 
+			    overflow-x: hidden;
 
+			    -webkit-box-sizing: border-box;
 
+			    box-sizing: border-box;
 
+			    font-size: .24rem;
 
+			    background: #fff !important;
 
+			    color: #3d3d3d;
 
+			    font-family: "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 
+			}
 
+		</style>
 
 		<script>
 
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});