From ea5b5c8284b14de6859e657b6be156ff03ab8893 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 19 May 2022 16:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devServiceProvideView.html                | 19 ++++++--------
 .../devServiceProvide/devServiceProvide.html  | 25 ++++++-------------
 .../devServiceProvide/devServiceProvide.js    |  3 ++-
 3 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/public/components/dev/devServiceProvideView/devServiceProvideView.html b/public/components/dev/devServiceProvideView/devServiceProvideView.html
index 2ab47675f..d5cd60bae 100755
--- a/public/components/dev/devServiceProvideView/devServiceProvideView.html
+++ b/public/components/dev/devServiceProvideView/devServiceProvideView.html
@@ -13,7 +13,7 @@
                     <label class="col-sm-2 col-form-label"><span><vc:i18n name="实现方式" namespace="devServiceProvideView"></vc:i18n></span></label>
                     <div class="col-sm-10">
                         <select class="custom-select" v-model="devServiceProvideViewInfo.queryModel">
-                            <option selected disabled value="">{{vc.i18n('必填','devServiceProvideView')}}，请选择实现方式</option>
+                            <option selected disabled value="">{{vc.i18n('必填，请选择实现方式','devServiceProvideView')}}</option>
                             <option value="1">sql方式</option>
                             <option value="3">java方式</option>
                             <option value="2">{{vc.i18n('存储过程方式','devServiceProvideView')}}</option>
@@ -22,36 +22,31 @@
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label"><span><vc:i18n name="参数" namespace="devServiceProvideView"></vc:i18n></span></label>
                     <div class="col-sm-10">
-                        <input v-model="devServiceProvideViewInfo.params" type="text" :placeholder="vc.i18n('必填，请填写参数','devServiceProvideView')"
-                               class="form-control">
+                        <input v-model="devServiceProvideViewInfo.params" type="text" :placeholder="vc.i18n('必填，请填写参数','devServiceProvideView')" class="form-control">
                     </div>
                 </div>
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==1">
                     <label class="col-sm-2 col-form-label">sql</label>
                     <div class="col-sm-10">
-                        <textarea rows="15" :placeholder="vc.i18n('选填，请填写','devServiceProvideView')sql" class="form-control"
-                                  v-model="devServiceProvideViewInfo.sql"></textarea></div>
+                        <textarea rows="15" :placeholder="vc.i18n('选填，请填写sql','devServiceProvideView')" class="form-control" v-model="devServiceProvideViewInfo.sql"></textarea></div>
                 </div>
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==1">
                     <label class="col-sm-2 col-form-label"><span><vc:i18n name="输出模板" namespace="devServiceProvideView"></vc:i18n></span></label>
                     <div class="col-sm-10">
-                        <textarea cols="10" :placeholder="vc.i18n('选填，请填写输出模板','devServiceProvideView')" class="form-control"
-                                  v-model="devServiceProvideViewInfo.template"></textarea></div>
+                        <textarea cols="10" :placeholder="vc.i18n('选填，请填写输出模板','devServiceProvideView')" class="form-control" v-model="devServiceProvideViewInfo.template"></textarea></div>
                 </div>
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==2">
                     <label class="col-sm-2 col-form-label"><span><vc:i18n name="存储过程" namespace="devServiceProvideView"></vc:i18n></span></label>
                     <div class="col-sm-10">
-                        <textarea cols="5" :placeholder="vc.i18n('选填，请填写存储过程','devServiceProvideView')" class="form-control"
-                                  v-model="devServiceProvideViewInfo.proc"></textarea></div>
+                        <textarea cols="5" :placeholder="vc.i18n('选填，请填写存储过程','devServiceProvideView')" class="form-control" v-model="devServiceProvideViewInfo.proc"></textarea></div>
                 </div>
                 <div class="form-group row" v-if="devServiceProvideViewInfo.queryModel==3">
                     <label class="col-sm-2 col-form-label">java</label>
                     <div class="col-sm-10">
-                        <textarea rows="20" :placeholder="vc.i18n('选填，请填写','devServiceProvideView')java" class="form-control"
-                                  v-model="devServiceProvideViewInfo.javaScript"></textarea></div>
+                        <textarea rows="20" :placeholder="vc.i18n('选填，请填写java','devServiceProvideView')" class="form-control" v-model="devServiceProvideViewInfo.javaScript"></textarea></div>
                 </div>
 
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/dev/devServiceProvide/devServiceProvide.html b/public/pages/dev/devServiceProvide/devServiceProvide.html
index 602ddb334..905c65b1c 100755
--- a/public/pages/dev/devServiceProvide/devServiceProvide.html
+++ b/public/pages/dev/devServiceProvide/devServiceProvide.html
@@ -1,4 +1,4 @@
-<div >
+<div>
 
     <div class="java110_step">
         <div id="step"></div>
@@ -6,22 +6,13 @@
 
     <!-- 选择 应用信息 -->
     <div v-if="devServiceProvideInfo.index == 0">
-        <vc:create path="dev/viewServiceInfo"
-                   callBackListener="devServiceProvide"
-                   callBackFunction="notify"
-        ></vc:create>
+        <vc:create path="dev/viewServiceInfo" callBackListener="devServiceProvide" callBackFunction="notify"></vc:create>
     </div>
     <div v-if="devServiceProvideInfo.index == 1">
-        <vc:create path="dev/devServiceProvideView"
-                   callBackListener="devServiceProvide"
-                   callBackFunction="notify"
-        ></vc:create>
+        <vc:create path="dev/devServiceProvideView" callBackListener="devServiceProvide" callBackFunction="notify"></vc:create>
     </div>
     <div v-if="devServiceProvideInfo.index == 2">
-        <vc:create path="dev/serviceProvideRemarkView"
-                   callBackListener="devServiceProvide"
-                   callBackFunction="notify"
-        ></vc:create>
+        <vc:create path="dev/serviceProvideRemarkView" callBackListener="devServiceProvide" callBackFunction="notify"></vc:create>
     </div>
 
 
@@ -29,13 +20,11 @@
         <div class="col-md-10"></div>
         <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
             <button type="button" class="btn btn-secondary" v-on:click="_prevStep()"><span><vc:i18n name="上一步" namespace="devServiceProvide"></vc:i18n></span></button>
-            <button v-if="devServiceProvideInfo.index != 2" type="button" class="btn btn-primary"
-                    style="margin-left:10px;" v-on:click="_nextStep()"><span><vc:i18n name="下一步" namespace="devServiceProvide"></vc:i18n></span>
+            <button v-if="devServiceProvideInfo.index != 2" type="button" class="btn btn-primary" style="margin-left:10px;" v-on:click="_nextStep()"><span><vc:i18n name="下一步" namespace="devServiceProvide"></vc:i18n></span>
             </button>
-            <button v-if="devServiceProvideInfo.index == 2" type="button" class="btn btn-primary"
-                    style="margin-left:10px;" v-on:click="_finishStep()"><span><vc:i18n name="完成" namespace="devServiceProvide"></vc:i18n></span>
+            <button v-if="devServiceProvideInfo.index == 2" type="button" class="btn btn-primary" style="margin-left:10px;" v-on:click="_finishStep()"><span><vc:i18n name="完成" namespace="devServiceProvide"></vc:i18n></span>
             </button>
         </div>
     </div>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/dev/devServiceProvide/devServiceProvide.js b/public/pages/dev/devServiceProvide/devServiceProvide.js
index 9e3ddbcf1..1b7038f9d 100755
--- a/public/pages/dev/devServiceProvide/devServiceProvide.js
+++ b/public/pages/dev/devServiceProvide/devServiceProvide.js
@@ -76,7 +76,8 @@
 
                             vc.toast('处理成功');
                             //关闭model
-                            vc.jumpToPage("/#/pages/dev/serviceProvideManage?" + vc.objToGetParam(JSON.parse(json)));
+                            //vc.jumpToPage("/#/pages/dev/serviceProvideManage?" + vc.objToGetParam(JSON.parse(json)));
+                            vc.goBack();
                             return;
                         }
                         vc.toast(json);