1

src/views/feedback/country.js

@@ -227,7 +227,7 @@ export default {
   荆州市: 'Jingzhou',
   咸宁市: 'Xianning',
   重庆市: 'Chongqing',
-  内蒙古: 'Neimengguzizhiqu',
+  内蒙古: 'Neimenggu',
   乌海市: 'Wuhai',
   乌兰察布盟: 'Wulanchabumeng',
   呼和浩特市: 'Huhehaote',

src/views/feedback/index.vue

@@ -117,7 +117,7 @@
     });
   }
   async function onSubmit(myData, setObjId = {}) {
-    let formData = JSON.parse(JSON.stringify(myData)); 
+    let formData = JSON.parse(JSON.stringify(myData));
     const md = new MobileDetect(window.navigator.userAgent);
     let addressRes = '';
     if (formData.country == 'China') {
@@ -125,7 +125,7 @@
     }
     let isChina = formData.country == '中国' || formData.country == 'China';
     if (md.mobile()) {
-      addressRes = isChina ? `${formData.country},${setObjId.city}` : formData.country;
+      addressRes = isChina ? `中国,${setObjId.city}` : formData.country;
     } else {
       addressRes = isChina ? `${formData.country},${formData.countries}` : formData.country;
     }
@@ -141,8 +141,8 @@
         return ele.response ? ele.response.data : ele.url;
       }),
     };
+    console.log('formData', formData, setObjId, 'apiData', apiData);
     await feedbackAdd(apiData);
-    // showSuccessToast('提交成功');
     myData.problemDesc = null;
     myData.problemDescImgs = [];
     myData.solution = null;
@@ -157,11 +157,11 @@
     myData.countries = [];
     myData.score = 0;
     myData.scoreReason = null;
-    if(md.mobile()){
-      setObjId.hardwareOptionId = null
-      setObjId.softwareOptionId = null
-      setObjId.industryOptionId = null
-      setObjId.city = null
+    if (md.mobile()) {
+      setObjId.hardwareOptionId = null;
+      setObjId.softwareOptionId = null;
+      setObjId.industryOptionId = null;
+      setObjId.city = null;
     }
     router.push('/feedbacksuccess');
   }
@@ -174,7 +174,7 @@
     let mccountries = locale.value == 'en-us' ? `${pingying[data.province]}/${pingying[data.city]}` : data.city;
     // data.province = locale.value == 'en-us' ? pingying[data.province] : data.province
     // data.city = locale.value == 'en-us' ? pingying[data.city] : data.city
-    if(data.province && data.province != '[]'){
+    if (data.province && data.province != '[]') {
       addres.value = {
         country: locale.value == 'en-us' ? data.countryEn : data.country,
         city: data.city,
@@ -225,7 +225,6 @@
 </script>
 
 <style lang="scss" scoped>
-
   .feedback {
     background: #e5edf9;
     min-height: 100vh;

src/views/feedback/mcSubmit.vue

@@ -182,7 +182,7 @@
         <van-popup v-model:show="showPicker.city" position="bottom">
           <van-cascader
             v-model="cascaderValue"
-            :title="locale == 'en-us'?'Please select your region':'请选择所在地区'"
+            :title="locale == 'en-us' ? 'Please select your region' : '请选择所在地区'"
             :options="columnsCity"
             @close="showPicker.city = false"
             @finish="onFinish"
@@ -274,7 +274,11 @@
     city: false,
   });
   const columnsCountry = countryList.map((ele) => {
-    return { text: locale.value == 'en-us' ? ele.english : ele.chinese, value: locale.value == 'en-us' ? ele.english : ele.chinese };
+    return {
+      text: locale.value == 'en-us' ? ele.english : ele.chinese,
+      value: locale.value == 'en-us' ? ele.english : ele.chinese,
+      zhText: ele.chinese,
+    };
   });
   const columnsCity = cityList.map((ele) => {
     return {
@@ -284,6 +288,7 @@
         return {
           text: locale.value == 'en-us' ? pingying[element.name] : element.name,
           value: element.name,
+          zhText: element.name,
         };
       }),
     };
@@ -293,13 +298,14 @@
   // 全部选项选择完毕后，会触发 finish 事件
   const onFinish = (a, _) => {
     showPicker.value.city = false;
-    console.log('onFinish', a, _);
     formData.value.city = a.selectedOptions.map((option) => option.text).join('/');
     setObjId.value.city = a.selectedOptions.map((option) => option.value).join(',');
+    console.log('onFinish', a, _, setObjId.value.city);
   };
   const onConfirm = ({ selectedOptions, selectedValues }, b) => {
+    console.log('onConfirm', selectedOptions, selectedValues);
     formData.value[b] = selectedValues.join(',');
-    setObjId.value[b] = selectedOptions[0].text;
+    setObjId.value[b] = selectedOptions[0].zhText || selectedOptions[0].text;
     showPicker.value[b] = false;
   };
   const onSubmit = () => {