diff --git a/index.html b/index.html
index ae3e673..4170b16 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>One Minute Feedback - Help Us Serve You Better！</title>
   <style>body{font-family:Arial,sans-serif;color:#333}.text-primary{color:#b43c1a}h3,h5,p{margin:.5em 0}.header-m{background:#ad1818;color:#fff;padding:.5em}.header-pc{height:90px!important;display:flex;align-items:center;justify-content:flex-start;background:#ad1818;color:#fff;padding:0 20px}.header-pc img{position:absolute;top:0;margin-right:20px;height:104px;width:auto;border-radius:0 0 3px 3px;background-color:#fff;box-shadow:1px 1px 10px 1px rgba(77,77,77,.7);-webkit-box-shadow:1px 1px 10px 1px rgba(77,77,77,.7);-moz-box-shadow:1px 1px 10px 1px rgba(77,77,77,.7)}.header-pc h1{margin:0;margin-left:240px}.form-container{width:100%;max-width:768px;margin:0 auto;margin-top:1.5em}.question{display:flex;flex-direction:column;align-items:start;margin-bottom:10px}.question h4{position:sticky;top:0;background-color:#fff;margin-top:0;padding-top:1.33em}.question-items{display:flex;flex-direction:column;align-items:start;margin-bottom: 10px;}.options{display:flex;flex-direction:column;align-items:start;}.options-row{flex-direction:row;justify-content:flex-end;align-items:baseline}.options-row-reverse{flex-direction:row-reverse;justify-content:flex-end;align-items:baseline}.radio-container{display:flex;align-items:center;margin-bottom:5px;margin-top: 5px;}.radio-container input[type=radio]{display:none}.radio-container label{margin-left:8px}.radio-container input[type=radio]:checked+.radio-label{background-color:#d54e21;color:#fff}.radio-label{display:inline-block;padding:5px 10px;border:1px solid #d54e21;border-radius:20px;transition:all .3s ease;font-size:14px}label.radio-label svg{vertical-align:text-bottom}.feedback{margin-top:10px}.feedback textarea{width:90%;padding:10px;resize:vertical;border:1px solid #d54e21;border-radius:5px}.form-btn{display:block;width:100%;padding:10px;margin-top:20px;border:none;border-radius:20px;cursor:pointer;transition:all .3s ease;background:0 0;border:1px solid #d54e21;color:#d54e21}.submit-btn{background-color:#d54e21;color:#fff}.submit-btn:hover{background-color:#b43c1a}.cancel-btn:hover{background-color:#00000011}.info-container{display:flex;flex-direction:column;justify-content:space-between;margin-bottom:10px}.info-item{margin-bottom:10px}.info-item p{color:#b43c1a}.signature-pad{border:1px solid #d54e21;border-radius:5px;z-index:10}.signature-container{display:flex;flex-direction:column;justify-content:flex-start;align-items:flex-start;flex-wrap:wrap}.button-container{margin-left:.5em;display:flex;flex-direction:column;justify-content:flex-start}.button{margin-top:1em;padding:10px;background-color:#d54e21;color:#fff;border:none;border-radius:5px;cursor:pointer}@media (min-width:768px){body{margin-left:0;margin-right:0;margin-top:0;padding-left:0;padding-right:0;padding-top:0}.question-items{width:100%;flex-direction:row;justify-content:space-between;align-items:baseline}.question-items h5{max-width: 230px;}.question-items .options{flex:1 1 auto}.options{flex-direction:row;justify-content:flex-end;align-items: center;}.info-container{flex-direction:row}.info-item{flex:1;margin-right:10px;margin-bottom:0}.info-item:last-child{margin-right:0}.header-m{display:none}.signature-container{flex-direction:row}}@media (max-width:767px){.header-pc{display:none}}</style>
   <style>
 #result{text-align:center;padding:20px}.bi-check-circle-fill,.bi-exclamation-circle-fill,.bi-x-circle-fill{fill:#d54e21}.bi-x-circle-fill{fill:#d54e21}
@@ -55,14 +56,14 @@
         <h4 v-if="!isFilled">Thank you for completing the Feedback Evaluation. Once submitted the tour guide would not be able to view your comments. </h4>
         <div class="city-page">
           <ul class="city-list" v-for="(city, index) in cityList" v-bind:key="city.cityName" v-on:click="selectCity(city)">
-            <li v-bind:class="[city.feedback_id ? 'filled' : '']">{{city.cityName}}</li>
+            <li v-bind:class="[city.feedback_Filled ? 'filled' : '']">{{city.cityName}}</li>
           </ul>
         </div>
       </template>
 
       <template v-if="!cityListPage">
         <!-- <h1>One Minute Feedback - Help Us Serve You Better！</h1> -->
-        <p>Did you enjoy your stay in the <span class="text-primary">{{group.cityName}}</span> area? Your honest feedback is appreciated to help us continually improve our service.</p>
+        <p>Did you enjoy your stay in the <span class="text-primary">{{currentCity.cityName}}</span> area? Your honest feedback is appreciated to help us continually improve our service.</p>
         <div class="info-container">
           <div class="info-item">
             <h3>Reference NO.:</h3>
@@ -74,7 +75,7 @@
           </div>
           <div class="info-item">
             <h3>City:</h3>
-            <p id="city">{{group.cityName}}</p>
+            <p id="city">{{currentCity.cityName}}</p>
           </div>
         </div>
         <hr>
@@ -87,38 +88,38 @@
             <h4>1. How satisfied were you with your tour guide?</h4>
             <div class="question-items" v-for="(q, qi) in feedbackItem.guide" v-bind:key="q.id">
               <h5>{{q.Describe}}</h5>
-              <options-item v-if="isWideScreen" question="guide" si="1" v-bind:qitem="q" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item>
-              <options-item-star v-else question="guide" si="1" v-bind:qitem="q" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item-star>
+              <options-item v-if="isWideScreen" question="guide" si="1" v-bind:qitem="q" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item>
+              <options-item-star v-else question="guide" si="1" v-bind:qitem="q" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item-star>
             </div>
           </div>
           <div class="question">
             <h4>2. How about the Driver and Car/Van?</h4>
             <div class="question-items" v-for="(q, qi) in feedbackItem.driver" v-bind:key="q.id">
               <h5>{{q.Describe}}</h5>
-              <options-item v-if="isWideScreen"question="Driver" v-bind:qitem="q" v-bind:si="2" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item>
-              <options-item-star v-else question="Driver" v-bind:qitem="q" v-bind:si="2" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item>
+              <options-item v-if="isWideScreen"question="Driver" v-bind:qitem="q" v-bind:si="2" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item>
+              <options-item-star v-else question="Driver" v-bind:qitem="q" v-bind:si="2" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item>
             </div>
           </div>
           <div class="question" v-if="feedbackItem.experience.length > 0">
             <h4>3. General Experience with:</h4>
             <div class="question-items" v-for="(q, qi) in feedbackItem.experience" v-bind:key="q.id">
               <h5>{{q.Describe}}</h5>
-              <options-item v-if="isWideScreen" question="Experience" v-bind:qitem="q" v-bind:si="3" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item>
-              <options-item-star v-else question="Experience" v-bind:qitem="q" v-bind:si="3" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="isFilled"></options-item>
+              <options-item v-if="isWideScreen" question="Experience" v-bind:qitem="q" v-bind:si="3" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item>
+              <options-item-star v-else question="Experience" v-bind:qitem="q" v-bind:si="3" v-bind:qi="qi" v-bind:key="q.id" v-bind:disabled="resultPage"></options-item>
             </div>
           </div>
           <div class="question " v-if="showPhotos">
             <h4>4. Would you give Asia Highlights permission to use photos taken by your tour guide(s) that contain your picture?</h2>
-              <judgment-item question="photo" v-bind:qitem="{id: 'photo_permission', rate: feedbackEvaluation.usePhotos}" si="photo" qi="photo" key="photo" v-bind:disabled="isFilled"></judgment-item>
+              <judgment-item question="photo" v-bind:qitem="{id: 'photo_permission', rate: feedbackEvaluation.usePhotos}" si="photo" qi="photo" key="photo" v-bind:disabled="resultPage"></judgment-item>
           </div>
           <div class="feedback question">
             <h4>Any other comments that you would like to share with us?</h4>
-            <p v-if="isFilled">{{feedbackEvaluation.otherComments ? feedbackEvaluation.otherComments : '--'}}</p>
-            <textarea v-else name="comments" rows="4" v-bind:value="feedbackEvaluation.otherComments" v-bind:disabled="isFilled"></textarea>
+            <p v-if="resultPage">{{feedbackEvaluation.otherComments ? feedbackEvaluation.otherComments : '--'}}</p>
+            <textarea v-else name="comments" rows="4" v-bind:value="feedbackEvaluation.otherComments" v-bind:disabled="resultPage"></textarea>
           </div>
           <div class="signature">
             <h4>Signature:</h4>
-            <div class="signature-container" v-if="!isFilled">
+            <div class="signature-container" v-if="!resultPage">
               <canvas id="signature-pad" class="signature-pad" v-bind:width="drawWidth" height=200 ></canvas>
               <div class="button-container">
                 <button type="button" id="clear" class="button" v-on:click="clearSignature()">Clear</button>
@@ -128,17 +129,19 @@
               <img id="signature-img" v-bind:src="feedbackEvaluation.signatureDataUrl" v-bind:width="drawWidth" />
             </div>
           </div>
-          <template v-if="!isFilled">
+          <template v-if="!resultPage">
             <button type="button" id="submit_a" class="form-btn submit-btn" v-on:click="submitForm">Finish & Submit</button>
-            <button type="button" id="back" class="form-btn cancel-btn" v-on:click="cancel">Cancel</button>
+            <button type="button" id="back" class="form-btn cancel-btn" v-on:click="cancel" v-if="cityList.length > 1">Cancel</button>
           </template>
         </form>
 
-        <span id="currentCity" class="float-text" v-show="!cityListOpen">{{currentCity.cityName}}</span>
-        <button class="float-button" v-on:click="toggleCityList">≡</button>
-        <ul v-bind:class="['expand-list', cityListOpen ? 'open' : '']">
-          <li v-for="city in cityList" v-bind:key="city.cityName" v-on:click="selectCity(city)" v-bind:class="{'active': city.cii_sn === currentCity.cii_sn, 'filled': (currentCity.feedback_id ? true : false)}">{{city.cityName}}</li>
-        </ul>
+        <template v-if="cityList.length > 1">
+          <span id="currentCity" class="float-text" v-show="!cityListOpen">{{currentCity.cityName}}</span>
+          <button class="float-button" v-on:click="toggleCityList" >≡</button>
+          <ul v-bind:class="['expand-list', cityListOpen ? 'open' : '']">
+            <li v-for="city in cityList" v-bind:key="city.cityName" v-on:click="selectCity(city)" v-bind:class="{'active': city.cii_sn === currentCity.cii_sn, 'filled': (currentCity.feedback_Filled ? true : false)}">{{city.cityName}}</li>
+          </ul>
+        </template>
 
       </template>
     </template>
@@ -247,6 +250,7 @@
       },
     });
     const defaultHeaders = { mode: 'no-cors', 'Sec-Fetch-Mode': 'no-cors' };
+    // const HOST = `http://202.103.68.144:890/service-CooperateSOA`; // debug: 0
     const HOST = `https://p9axztuwd7x8a7.mycht.cn/service-CooperateSOA`;
     const index = new Vue({
       el: '#app',
@@ -317,6 +321,7 @@
             return false;
           }
           this.loading = true;
+          // console.log(this.resultPage);
           this.getCityList();
         },
         getCityList() {
@@ -336,17 +341,24 @@
             const mergeCity = groupBy(res.cityList, ele => isEmpty(ele.tourGuideId) ? 'unknown' : ele.tourGuideId);
             const mergeCityA = Object.keys(mergeCity).reduce((r, tgid) => {
               if (  (tgid !== 'unknown')) {
+                const uniqueCII_SN = mergeCity[tgid].map(v => v.cii_sn).filter((v, i, a) => a.indexOf(v) === i);
+                const uniqueCII_Name = mergeCity[tgid].map(v => v.cityName).filter((v, i, a) => a.indexOf(v) === i);
                 return r.concat(mergeCity[tgid].length > 1 ? [{
                   ...mergeCity[tgid][0],
-                  cii_sn: mergeCity[tgid].map(v => v.cii_sn).join('_'),
-                  cii_sn_arr: mergeCity[tgid].map(v => v.cii_sn),
-                  cityName: mergeCity[tgid].map((v) => v.cityName).join(' & '),
-                  cities: mergeCity[tgid],
+                  cii_sn: uniqueCII_SN.join('_'),
+                  cii_sn_arr: uniqueCII_SN,
+                  cityName: uniqueCII_Name.join(' & '),
+                  feedback_Filled: mergeCity[tgid].reduce((r, v) => r+v.feedback_Filled, 0) > 0,
+                  // cities: mergeCity[tgid],
                 }] : mergeCity[tgid][0] );
               }
               return r.concat(mergeCity[tgid]);
             }, []);
+            // console.log(mergeCityA);
             that.cityList = mergeCityA;
+            if (mergeCityA.length === 1) {
+              that.selectCity(mergeCityA[0]);
+            }
           });
         },
         selectCity(city) {
@@ -366,6 +378,7 @@
           const selectedCity = Object.assign({}, city, _param);
           // console.log(selectedCity);
           this.currentCity = selectedCity;
+          this.feedbackItem.hotel = [];
           if (selectedCity.cii_sn_arr) {
             for (const iterator of selectedCity.cii_sn_arr) {
               this.getData(Object.assign({}, _param, { CITY_SN: iterator }), true);
@@ -417,7 +430,7 @@
             if (itemGroup.A) {
               hotel = hotel.concat(itemGroup.A.map(function (ele) {
                 var newEle = Object.assign({}, ele);
-                newEle.Describe = 'Hotel\n' + ele.name;
+                newEle.Describe = `${ele.name} ${res.group[0].cityName}`;
                 return newEle;
               }));
               that.currentCity[`city_${res.feedbackEvaluation[0].feedback_cii_sn}`] = hotel;
@@ -436,9 +449,10 @@
             that.group = res.group[0];
 
             // 已经填写过了
-            that.isFilled = !isEmpty(res.feedbackEvaluation[0].feedbackId);
-            that.cityListPage = !that.resultPage;
-            if (!isEmpty(res.feedbackEvaluation[0].feedbackId)) {
+            // that.isFilled = !isEmpty(res.feedbackEvaluation[0].signatureDataUrl);
+            that.isFilled = that.currentCity.feedback_Filled || !isEmpty(res.feedbackEvaluation[0].signatureDataUrl);
+            that.cityListPage = that.resultPage ? false : that.isFilled;
+            if (that.resultPage || that.isFilled) {
               // that.signaturePad.fromDataURL(that.feedbackEvaluation.signatureDataUrl);
             } else {
               that.initSignature();
