Browse Source

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

张涛 1 year ago
parent
commit
40464e8aeb

+ 8
- 0
src/pages/check/edit/components/LocForm.jsx View File

98
           value={answer?.addr}
98
           value={answer?.addr}
99
           onChange={(e) => setFieldChange("addr", e.detail)}
99
           onChange={(e) => setFieldChange("addr", e.detail)}
100
         />
100
         />
101
+        {checkType == "loc" && (
102
+          <Field
103
+            key="03"
104
+            readonly={readonly}
105
+            label="名称"
106
+            placeholder="请输入名称"
107
+          />
108
+        )}
101
       </CellGroup>
109
       </CellGroup>
102
       {checkType == "survey" && (
110
       {checkType == "survey" && (
103
         <CellGroup style={{ marginTop: "20px" }}>
111
         <CellGroup style={{ marginTop: "20px" }}>

+ 1
- 1
src/pages/check/edit/components/Question.jsx View File

99
             </CellGroup>
99
             </CellGroup>
100
             <CellGroup style={{ marginTop: '20px' }}>
100
             <CellGroup style={{ marginTop: '20px' }}>
101
               <Cell renderTitle={
101
               <Cell renderTitle={
102
-                <><Text style={{ color: 'red' }}>* </Text> <Text>拍照或视频</Text></>
102
+                <><Text style={{ color: 'red' }}>*</Text> <Text>拍照或视频</Text></>
103
               }
103
               }
104
                 border={false}
104
                 border={false}
105
               />
105
               />

+ 1
- 1
src/pages/check/edit/index.jsx View File

106
     const finished = quList.filter(x => x.finished).length == quList.length;
106
     const finished = quList.filter(x => x.finished).length == quList.length;
107
     if (!answer || !answer.answerItemList || !finished) {
107
     if (!answer || !answer.answerItemList || !finished) {
108
       Notify.show({
108
       Notify.show({
109
-        message: '请作答完成所有题目照片',
109
+        message: '请作答完成所有题目照片',
110
         type: 'warning',
110
         type: 'warning',
111
       })
111
       })
112
       return;
112
       return;

+ 1
- 1
src/pages/check/list/index.jsx View File

15
 
15
 
16
   const onClick = (typ, item) => {
16
   const onClick = (typ, item) => {
17
     if (typ == 'loc') {
17
     if (typ == 'loc') {
18
-      console.log('------xiaofang----->');
18
+      // console.log('------xiaofang----->');
19
       Taro.navigateTo({
19
       Taro.navigateTo({
20
         url: `/pages/check/loc/list/index?checkId=${item.checkId}`
20
         url: `/pages/check/loc/list/index?checkId=${item.checkId}`
21
       })
21
       })