fix

config/dev.js

@@ -24,7 +24,7 @@ module.exports = {
       proxy: {
         '/api': {
           // target: 'https://sgl.ycjcjy.com',
-          target: 'http://192.168.211.105:7080',
+          target: 'http://192.168.31.211:7080',
           changeOrigin: true
         }
       }

src/pages/account/edit/index.jsx

@@ -67,6 +67,23 @@ const index = props => {
   };
   function formSubmit(e) {
     console.log(e.detail, "formSubmit");
+
+    if (!e.detail.value.name) {
+      Taro.showToast({
+        title: "请输入名称",
+        icon: "none",
+        duration: 2000
+      });
+      return;
+    }
+    if (!e.detail.value.phone) {
+      Taro.showToast({
+        title: "请输入号码",
+        icon: "none",
+        duration: 2000
+      });
+      return;
+    }
     editShopKeeper(e.detail.value);
   }
 

src/pages/label/edit/index.jsx

@@ -29,6 +29,15 @@ const index = props => {
   const onSave = () => {
     console.log(333);
 
+    if(!name){
+      Taro.showToast({
+        title: "请输入名称",
+        icon: "none",
+        duration: 2000
+      });
+      return;
+    }
+
     if (id) {
       Taro.showModal({
         title: "确定修改该标签组吗？",

src/pages/label/index.jsx

@@ -81,7 +81,8 @@ const house = props => {
                     <View>标签组名称：{x.name}</View>
                   </View>
                   <View className="bottom">
-                    <Text
+                    <View
+                    style={{height:'100%',width:'50%'}}
                       onClick={() => {
                         Taro.navigateTo({
                           url: `/pages/label/edit/index?id=${x.groupId}`
@@ -89,8 +90,8 @@ const house = props => {
                       }}
                     >
                       编辑
-                    </Text>
-                    <Text onClick={() => onDelete(x)}>删除</Text>
+                    </View>
+                    <View onClick={() => onDelete(x)}>删除</View>
                   </View>
                 </ContainerLayout>
               </View>

src/pages/mateTag/edit/index.jsx

@@ -28,7 +28,16 @@ const index = props => {
   };
 
   const onSave = () => {
-    console.log(333);
+  
+    if(!name){
+      Taro.showToast({
+        title: "请输入名称",
+        icon: "none",
+        duration: 2000
+      });
+      return;
+    }
+
 
     if (tagId) {
       Taro.showModal({

src/pages/shop/index.jsx

@@ -20,10 +20,16 @@ const account = props => {
 
   console.log(props, radioHouseState);
   useEffect(() => {
-    getShopList({ pageNum: 1, pageSize: 10 });
+    
   }, []);
 
   useDidShow(() => {
+    getShopList({ pageNum: 1, pageSize: 10 });
+    // if(page.pageNum==1){
+
+    // }else{
+    //   getShopList({ pageNum: 1, pageSize: 10 });
+    // }
     
   });
 
@@ -35,7 +41,12 @@ const account = props => {
           ...page,
           pageNum: page.current
         });
-        setList(list.concat(records || []));
+        if(page.current===1){
+          setList(records || []);
+        }else {
+          setList(list.concat(records || []));
+        }
+        
       })
       .catch(() => setLoading(false));
   }

src/util/request.js

@@ -9,16 +9,27 @@ export default async (options) => {
 
   return Taro.request(opts)
     .then((res) => {
-      console.log('3322');
+      console.log(res, '----------');
+      const { code } = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+      if (code == '1000') {
+        return res
+      } else {
+        throw res
+      }
       return res
     })
     .catch((err) => {
-      console.log(err, '333221');
-      return err
+      console.log(err, '111111111111');
+      if(err.status=== 504){
+        Taro.showToast({
+          title: "请检查网络",
+          icon: 'none'
+        })
+        throw err
+      }
+      throw err
     })
 }
-// import useUser from './store/user'
-// const {user} = useUser()
 
 export function optionBuilder(options) {
   const {