dev01 2 years ago
parent
commit
8762dad18f

+ 26 - 28
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -150,10 +150,10 @@ const inSpecial = React.createClass({
           recipientAddress: thisdata.recipientAddress,
           orgCodeUrl: thisdata.voucherUrl
             ? splitUrl(
-                thisdata.voucherUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisdata.voucherUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
         });
       }.bind(this),
@@ -437,9 +437,9 @@ const inSpecial = React.createClass({
         examine: this.state.examine,
         reason: this.state.reason
       },
-      success: function() {}.bind(this)
+      success: function () { }.bind(this)
     }).done(
-      function() {
+      function () {
         this.setState({
           loading: false
         });
@@ -722,27 +722,25 @@ const inSpecial = React.createClass({
           width="400px"
           onCancel={this.rejectCancels}
         >
-          <Spin spinning={this.state.loading}>
-            <Input.TextArea
-              placeholder="请输入拒绝理由"
-              rows={4}
-              value={this.state.reason}
-              onChange={(e) => {
-                this.setState({ reason: e.target.value });
+          <Input.TextArea
+            placeholder="请输入拒绝理由"
+            rows={4}
+            value={this.state.reason}
+            onChange={(e) => {
+              this.setState({ reason: e.target.value });
+            }}
+          ></Input.TextArea>
+          <div className="clearfix" style={{ marginTop: "20px" }}>
+            <Button
+              type="primary"
+              onClick={(e) => {
+                e.stopPropagation(), this.commit();
               }}
-            ></Input.TextArea>
-            <div className="clearfix" style={{ marginTop: "20px" }}>
-              <Button
-                type="primary"
-                onClick={(e) => {
-                  e.stopPropagation(), this.commit();
-                }}
-                style={{ float: "right" }}
-              >
-                提交
-              </Button>
-            </div>
-          </Spin>
+              style={{ float: "right" }}
+            >
+              提交
+            </Button>
+          </div>
         </Modal>
         <Modal
           className="admin-desc-content"
@@ -813,8 +811,8 @@ const inSpecial = React.createClass({
                       {this.state.invoiceType === 0
                         ? "增值税专用发票"
                         : this.state.invoiceType === 1
-                        ? "增值税普通发票"
-                        : "其他"}
+                          ? "增值税普通发票"
+                          : "其他"}
                     </span>
                   </FormItem>
                 </div>

+ 19 - 21
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -690,28 +690,26 @@ const invoiceApplyList = React.createClass({
           width="400px"
           onCancel={this.rejectCancels}
         >
-          <Spin spinning={this.state.Loading}>
-            <Input.TextArea
-              placeholder="请输入拒绝理由"
-              rows={4}
-              value={this.state.reason}
-              onChange={(e) => {
-                this.setState({ reason: e.target.value });
+          <Input.TextArea
+            placeholder="请输入拒绝理由"
+            rows={4}
+            value={this.state.reason}
+            onChange={(e) => {
+              this.setState({ reason: e.target.value });
+            }}
+          ></Input.TextArea>
+          <div className="clearfix" style={{ marginTop: "20px" }}>
+            <Button
+              type="primary"
+              onClick={(e) => {
+                e.stopPropagation(),
+                  this.commit();
               }}
-            ></Input.TextArea>
-            <div className="clearfix" style={{ marginTop: "20px" }}>
-              <Button
-                type="primary"
-                onClick={(e) => {
-                  e.stopPropagation(),
-                    this.commit();
-                }}
-                style={{ float: "right" }}
-              >
-                提交
-              </Button>
-            </div>
-          </Spin>
+              style={{ float: "right" }}
+            >
+              提交
+            </Button>
+          </div>
         </Modal>
         <KaiPiaoModal
           visible={this.state.avisible}

+ 0 - 2
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -692,7 +692,6 @@ const outSpecial = React.createClass({
           width="400px"
           onCancel={this.rejectCancels}
         >
-          <Spin spinning={this.state.Loading}>
             <Input.TextArea
               placeholder="请输入拒绝理由"
               rows={4}
@@ -712,7 +711,6 @@ const outSpecial = React.createClass({
                 提交
               </Button>
             </div>
-          </Spin>
         </Modal>
         <Modal
           className="admin-desc-content"

+ 2 - 2
package.json

@@ -1,13 +1,13 @@
 {
   "name": "afanti",
-  "version": "1.2.22",
+  "version": "1.2.25",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
-    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://s.jishutao.com'",
+    "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'https://s.jishutao.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
     "buildtest": "node --max-old-space-size=8192 bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",

+ 2 - 2
webpack-dll.config.js

@@ -13,10 +13,10 @@ module.exports = (function () {
   let staticHost = 'http://172.16.1.187';
   switch (argv.env.deploy) {
     case 'test':
-      staticHost = 'http://static.jishutao.com';
+      staticHost = '//static.jishutao.com';
       break;
     case 'prod':
-      staticHost = 'http://s.jishutao.com';
+      staticHost = '//s.jishutao.com';
       break;
     default:
       break;

+ 2 - 2
webpack.config.js

@@ -350,10 +350,10 @@ module.exports = (function () {
     // let staticHost = "http://192.168.0.103";
     switch (argv.env.deploy) {
         case 'test':
-            staticHost = 'http://static.jishutao.com'
+            staticHost = '//static.jishutao.com'
             break
         case 'prod':
-            staticHost = 'http://s.jishutao.com'
+            staticHost = '//s.jishutao.com'
             break
         default:
             break