Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/miniapp into dev1.0

src/pages/check/edit/components/LocForm.jsx

@@ -98,6 +98,14 @@ export default (props) => {
           value={answer?.addr}
           onChange={(e) => setFieldChange("addr", e.detail)}
         />
+        {checkType == "loc" && (
+          <Field
+            key="03"
+            readonly={readonly}
+            label="名称"
+            placeholder="请输入名称"
+          />
+        )}
       </CellGroup>
       {checkType == "survey" && (
         <CellGroup style={{ marginTop: "20px" }}>

src/pages/check/edit/components/Question.jsx

@@ -99,7 +99,7 @@ export default (props) => {
             </CellGroup>
             <CellGroup style={{ marginTop: '20px' }}>
               <Cell renderTitle={
-                <><Text style={{ color: 'red' }}>* </Text> <Text>拍照或视频</Text></>
+                <><Text style={{ color: 'red' }}>*</Text> <Text>拍照或视频</Text></>
               }
                 border={false}
               />

src/pages/check/edit/index.jsx

@@ -106,7 +106,7 @@ export default (props) => {
     const finished = quList.filter(x => x.finished).length == quList.length;
     if (!answer || !answer.answerItemList || !finished) {
       Notify.show({
-        message: '请作答完成所有题目即照片',
+        message: '请作答完成所有题目及照片',
         type: 'warning',
       })
       return;

src/pages/check/list/index.jsx

@@ -15,7 +15,7 @@ export default (props) => {
 
   const onClick = (typ, item) => {
     if (typ == 'loc') {
-      console.log('------xiaofang----->');
+      // console.log('------xiaofang----->');
       Taro.navigateTo({
         url: `/pages/check/loc/list/index?checkId=${item.checkId}`
       })