4 Commits aa9b2a1879 ... 8596e47319

Autor SHA1 Mensaje Fecha
  lisy 8596e47319 Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx hace 2 semanas
  lisy a66f1146f2 修改 hace 2 semanas
  lisy 3845e269b9 修改 hace 2 semanas
  lisy 679312d38f 修改 hace 2 semanas
Se han modificado 4 ficheros con 171 adiciones y 7 borrados
  1. 3 3
      src/App.vue
  2. 4 4
      src/pages/login/login.vue
  3. 13 0
      src/plant/port/port-create/index.vue
  4. 151 0
      stats.html

+ 3 - 3
src/App.vue

@@ -15,10 +15,10 @@ onLaunch(async () => {
 });
 // 设置token并指定过期时间(例如24小时)
 console.log('设定token');
-//infoStore.setToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjoxOTQwMjQ1NzU5Mjk2ODY0MjU3Iiwicm5TdHIiOiJiVllYa0QwVnY2T3JLNnc1d1ZOTlpiV0hFUTlhU1J2RyIsImNsaWVudGlkIjoiMjAyNTAyMTQiLCJvcGVuaWQiOiJva0NHMjRrU29nT2VWTGFkc1JVYm8tS2JqR2Y4IiwidXNlcklkIjoxOTQwMjQ1NzU5Mjk2ODY0MjU3fQ.-gNoaCFtXKHYtiGLdd5mpEyhBf9AZ9BTw9udNA_1feM', 24 * 60 * 60 * 1000)
+infoStore.setToken('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjoxOTQwMjQ1NzU5Mjk2ODY0MjU3Iiwicm5TdHIiOiJxRTE5RXhnZHVwa2hpdWo4eUo2M1pSZ0M1ZGxrNmt4YyIsImNsaWVudGlkIjoiMjAyNTAyMTQiLCJvcGVuaWQiOiJva0NHMjRrU29nT2VWTGFkc1JVYm8tS2JqR2Y4IiwidXNlcklkIjoxOTQwMjQ1NzU5Mjk2ODY0MjU3fQ.g8ZPjLyKcQQ2WOOsyoopjQMHepnutGJ5a1MGvAbgwzs');
 console.log('获取用户信息,app');
-// infoStore.getUserInfo()
-// infoStore.getCompanyInfo()
+infoStore.getUserInfo();
+infoStore.getCompanyInfo();
 onShow(() => {
     console.log('App Show');
 });

+ 4 - 4
src/pages/login/login.vue

@@ -86,25 +86,25 @@
             <view class="d-flex j-sa pl-20 pr-20">
                 <view v-if="!isShowPhoneLogin" class="d-flex flex-cln j-c a-c" @click="isShowPhoneLogin = true">
                     <view class="bc-#f2f2f2 d-flex j-c a-c">
-                        <image class="w-95" src="/static/images/plant/accountNumber.png" mode="widthFix" />
+                        <image class="w-95 h-95" src="/static/images/plant/accountNumber.png" mode="widthFix" />
                     </view>
                     <view class="c-#ccc f-s-24 pt-10">账号密码</view>
                 </view>
                 <view v-if="isShowPhoneLogin" class="d-flex flex-cln j-c a-c" @click="isShowPhoneLogin = false">
                     <view class="bc-#f2f2f2 d-flex j-c a-c">
-                        <image class="w-95" src="/static/images/plant/QuickLogin.png" mode="widthFix" />
+                        <image class="w-95 h-95" src="/static/images/plant/QuickLogin.png" mode="widthFix" />
                     </view>
                     <view class="c-#ccc f-s-24 pt-10">一键登录</view>
                 </view>
                 <view class="d-flex flex-cln j-c a-c">
                     <view class="bc-#f2f2f2 d-flex j-c a-c">
-                        <image class="w-95" src="/static/images/plant/SZYYLogo.png" mode="widthFix" />
+                        <image class="w-95 h-95" src="/static/images/plant/SZYYLogo.png" mode="widthFix" />
                     </view>
                     <view class="c-#ccc f-s-24 pt-10">数字云药</view>
                 </view>
                 <view class="d-flex flex-cln j-c a-c">
                     <view class="bc-#f2f2f2 d-flex j-c a-c">
-                        <image class="w-95" src="/static/images/plant/cxlmLogo.png" mode="widthFix" />
+                        <image class="w-95 h-95" src="/static/images/plant/cxlmLogo.png" mode="widthFix" />
                     </view>
                     <view class="c-#ccc f-s-24 pt-10">中药材创新联盟</view>
                 </view>

+ 13 - 0
src/plant/port/port-create/index.vue

@@ -68,6 +68,15 @@
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
+                    <up-form-item borderBottom label="养殖时间" required prop="queryType6">
+                        <ut-datetime-picker v-model="form.queryType6.startDate" mode="date" dateFields="month">
+                            <up-input v-model="form.queryType6.startDate" placeholder="请选择养殖开始时间" border="none"></up-input>
+                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        </ut-datetime-picker>
+                        <ut-datetime-picker v-model="form.queryType6.endDate" mode="date" dateFields="month">
+                            <up-input v-model="form.queryType6.endDate" placeholder="请选择养殖结束时间" border="none"></up-input>
+                        </ut-datetime-picker>
+                    </up-form-item>
                 </view>
             </up-form>
         </view>
@@ -89,6 +98,10 @@ const form = ref({
     queryType3: '',
     queryType4: '',
     queryType5: '',
+    queryType6: {
+        startDate: '',
+        endDate: '',
+    },
 });
 const paging = ref<unknown>('paging');
 const list = ref<unknown>([]);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 151 - 0
stats.html


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio